From 8b2b083b28f6a3c35ab97c58c6f5360bd8836d5f Mon Sep 17 00:00:00 2001 From: Dmitry Cherepanov Date: Thu, 27 Aug 2009 17:06:23 +0400 Subject: [PATCH] 6854898: Frame is located at the negative coordinates instead of origin for Solaris 10 CDE Reviewed-by: art, anthony --- jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java | 4 ++-- jdk/src/solaris/classes/sun/awt/X11/XToolkit.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java b/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java index 218bb303270..d28ec9e1b3f 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java @@ -71,8 +71,8 @@ public abstract class XErrorHandler { return super.handleError(display, err); } // Shared instance - private static IgnoreBadWindowHandler theInstance = new IgnoreBadWindowHandler(); - public static IgnoreBadWindowHandler getInstance() { + private static VerifyChangePropertyHandler theInstance = new VerifyChangePropertyHandler(); + public static VerifyChangePropertyHandler getInstance() { return theInstance; } } diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java index 14839c7b671..95b4e0c406b 100644 --- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java +++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java @@ -166,6 +166,9 @@ public final class XToolkit extends UNIXToolkit implements Runnable { } public static void RESTORE_XERROR_HANDLER() { + // wait until all requests are processed by the X server + // and only then uninstall the error handler + XSync(); current_error_handler = null; }