--- a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java	Thu Aug 27 17:04:47 2009 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java	Thu Aug 27 17:06:23 2009 +0400
@@ -71,8 +71,8 @@
             return super.handleError(display, err);
         }
         // Shared instance
-        private static IgnoreBadWindowHandler theInstance = new IgnoreBadWindowHandler();
-        public static IgnoreBadWindowHandler getInstance() {
+        private static VerifyChangePropertyHandler theInstance = new VerifyChangePropertyHandler();
+        public static VerifyChangePropertyHandler getInstance() {
             return theInstance;
         }
     }

--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Thu Aug 27 17:04:47 2009 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Thu Aug 27 17:06:23 2009 +0400
@@ -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;
     }