1.1 --- a/src/solaris/classes/sun/awt/X11InputMethod.java	Mon Mar 12 18:47:29 2012 +0100
     1.2 +++ b/src/solaris/classes/sun/awt/X11InputMethod.java	Mon Mar 19 10:47:48 2012 +0100
     1.3 @@ -273,7 +273,7 @@
     1.4             resetXIC on the active client. resetXIC will always be
     1.5             called on the passive client when endComposition is called.
     1.6          */
     1.7 -        if (needResetXIC && haveActiveClient() &&
     1.8 +        if (needResetXIC && haveActiveClient() && needResetXICClient!=null &&
     1.9              getClientComponent() != needResetXICClient.get()){
    1.10              resetXIC();
    1.11