--- old/src/share/classes/sun/awt/im/InputContext.java 2012-11-01 18:16:02.000000000 +0300 +++ new/src/share/classes/sun/awt/im/InputContext.java 2012-11-01 18:16:02.000000000 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -786,6 +786,7 @@ public void disableNativeIM() { InputMethod inputMethod = getInputMethod(); if (inputMethod != null && inputMethod instanceof InputMethodAdapter) { + inputMethod.endComposition(); ((InputMethodAdapter)inputMethod).disableInputMethod(); } }