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

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -53,11 +53,11 @@
 
     /**
      * Reset the composition state to the current composition state.
      */
     protected void resetCompositionState() {
-        if (compositionEnableSupported) {
+        if (compositionEnableSupported && haveActiveClient()) {
             try {
                 /* Restore the composition mode to the last saved composition
                    mode. */
                 setCompositionEnabled(savedCompositionState);
             } catch (UnsupportedOperationException e) {