src/java.desktop/unix/classes/sun/awt/X11InputMethod.java

*** 68,77 ****
--- 68,78 ----
  
      /**
       * Activate input method.
       */
      public synchronized void activate() {
+         activatedInstance = this;
          clientComponentWindow = getClientComponentWindow();
          if (clientComponentWindow == null)
              return;
  
          if (lastXICFocussedComponent != null) {
*** 138,147 ****
--- 139,149 ----
             called, it can be restored correctly till activate is called on the newly focused
             component. (See also sun/awt/im/InputContext and bug 6184471).
             Last note, getCompositionState should be called before setXICFocus since
             setXICFocus here sets the XIC to 0.
          */
+         activatedInstance = null;
          savedCompositionState = getCompositionState();
  
          if (isTemporary) {
              //turn the status window off...
              turnoffStatusWindow();