--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Fri Aug 14 14:25:22 2009 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Wed Sep 16 19:36:05 2009 -0700
@@ -169,6 +169,9 @@
     }
 
     public static void RESTORE_XERROR_HANDLER() {
+        // wait until all requests are processed by the X server
+        // and only then uninstall the error handler
+        XSync();
         current_error_handler = null;
     }