# HG changeset patch
# User azvegint
# Date 1401441411 -14400
# Node ID e7a8dcafc479ba33483da94be4a4dcaf0b42d080
# Parent  d237e069dd9ce48f5e7995628403fe6423dfb0fc
8031471: Test closed/java/awt/dnd/FileDialogDropTargetTest/FileDialogDropTargetTest.java fails on Solaris zones virtual hosts
Reviewed-by: anthony, serb

diff -r d237e069dd9c -r e7a8dcafc479 jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java	Fri May 30 15:24:42 2014 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java	Fri May 30 13:16:51 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,6 +97,7 @@
      * @param handler the synthetic error handler to set
      */
     public static void WITH_XERROR_HANDLER(XErrorHandler handler) {
+        XSync();
         saved_error = null;
         current_error_handler = handler;
     }
@@ -105,15 +106,9 @@
      * Unsets a current synthetic error handler. Must be called with the acquired AWT lock.
      */
     public static void RESTORE_XERROR_HANDLER() {
-        RESTORE_XERROR_HANDLER(true);
-    }
-
-    private static void RESTORE_XERROR_HANDLER(boolean doXSync) {
-        if (doXSync) {
-            // Wait until all requests are processed by the X server
-            // and only then uninstall the error handler.
-            XSync();
-        }
+        // Wait until all requests are processed by the X server
+        // and only then uninstall the error handler.
+        XSync();
         current_error_handler = null;
     }