# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1287407902 -3600
# Node ID 902c6f3360081179c50aea802f09e8160c31418a
# Parent  eb34904f4061449ed2922036dbaa4042668df8e2# Parent  35325772e106456926101630a4644aafd4d07e39
Merge

diff -r eb34904f4061 -r 902c6f336008 ChangeLog
--- a/ChangeLog	Mon Oct 18 14:13:53 2010 +0100
+++ b/ChangeLog	Mon Oct 18 14:18:22 2010 +0100
@@ -1,3 +1,9 @@
+2010-10-15  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* patches/openjdk/6853592-BadWindow-warning-fix.patch:
+	Added patch which fixes bug #6853592 introduced by another patch
+	6678385-window_movement_crasher.patch
+
 2010-10-13  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS:
diff -r eb34904f4061 -r 902c6f336008 Makefile.am
--- a/Makefile.am	Mon Oct 18 14:13:53 2010 +0100
+++ b/Makefile.am	Mon Oct 18 14:18:22 2010 +0100
@@ -369,7 +369,8 @@
 	patches/fonts-rhel.patch \
 	patches/openjdk/6638712-wildcard_types.patch \
 	patches/openjdk/6650759-missing_inference.patch \
-	patches/numa_on_early_glibc.patch
+	patches/numa_on_early_glibc.patch \
+        patches/openjdk/6853592-badwindow-warning-fix.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \
diff -r eb34904f4061 -r 902c6f336008 patches/openjdk/6853592-badwindow-warning-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6853592-badwindow-warning-fix.patch	Mon Oct 18 14:18:22 2010 +0100
@@ -0,0 +1,16 @@
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	2010-07-15 10:28:21.896105637 -0400
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java	2010-07-15 10:30:45.039232001 -0400
+@@ -298,13 +298,6 @@
+                 if (log.isLoggable(Level.FINE)) {
+                         dumpPeers();
+                 }
+-
+-                awtLock();
+-                try {
+-                        XlibWrapper.XSetErrorHandler(saved_error_handler);
+-                } finally {
+-                        awtUnlock();
+-                }
+             }
+         });
+     }