--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Mon Oct 05 18:22:00 2009 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	Tue Oct 06 23:40:27 2009 -0700
@@ -326,13 +326,6 @@
                 if (log.isLoggable(PlatformLogger.FINE)) {
                     dumpPeers();
                 }
-
-                awtLock();
-                try {
-                    XlibWrapper.XSetErrorHandler(saved_error_handler);
-                } finally {
-                    awtUnlock();
-                }
             }
         });
     }