--- a/src/solaris/classes/sun/awt/X11/XToolkit.java	Tue Oct 26 15:21:25 2010 +0100
+++ b/src/solaris/classes/sun/awt/X11/XToolkit.java	Tue Oct 26 16:47:09 2010 +0100
@@ -296,13 +296,6 @@ public class XToolkit extends UNIXToolki
                 public void run() {
                     if (log.isLoggable(Level.FINE)) {
                         dumpPeers();
-                    }
-
-                    awtLock();
-                    try {
-                        XlibWrapper.XSetErrorHandler(saved_error_handler);
-                    } finally {
-                        awtUnlock();
                     }
                 }
             });