--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Thu Sep 24 22:50:41 2009 +0100
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Tue Oct 06 21:40:55 2009 -0700
@@ -166,6 +166,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;
     }