--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Tue Sep 22 01:20:51 2009 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Wed Sep 30 13:21:51 2009 +0400
@@ -324,13 +324,6 @@
                 if (log.isLoggable(Level.FINE)) {
                     dumpPeers();
                 }
-
-                awtLock();
-                try {
-                    XlibWrapper.XSetErrorHandler(saved_error_handler);
-                } finally {
-                    awtUnlock();
-                }
             }
         });
     }