From 0d7e36485c47caa8f6a1b9d748eab12feb8e38d5 Mon Sep 17 00:00:00 2001
From: Dmitry Cherepanov <dcherepanov@openjdk.org>
Date: Wed, 30 Sep 2009 13:21:51 +0400
Subject: [PATCH] 6853592: VM test nsk.regression.b4261880  fails with "X Error
 of failed request:  BadWindow" inconsistently

Reviewed-by: art, anthony
---
 jdk/src/solaris/classes/sun/awt/X11/XToolkit.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
index 95b4e0c406b..f1302130a48 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
@@ -324,13 +324,6 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
                 if (log.isLoggable(Level.FINE)) {
                     dumpPeers();
                 }
-
-                awtLock();
-                try {
-                    XlibWrapper.XSetErrorHandler(saved_error_handler);
-                } finally {
-                    awtUnlock();
-                }
             }
         });
     }