changeset 2266:66e3c18bd585

Added patch which fixes bug #6853592 introduced by another patch 6678385-window_movement_crasher.patch
author ptisnovs
date Mon, 18 Oct 2010 11:29:08 +0200
parents f087888f1785
children c1a198d6dec9
files ChangeLog Makefile.am patches/openjdk/6853592-badwindow-warning-fix.patch
diffstat 3 files changed, 24 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 13 01:29:59 2010 +0100
+++ b/ChangeLog	Mon Oct 18 11:29:08 2010 +0200
@@ -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:
--- a/Makefile.am	Wed Oct 13 01:29:59 2010 +0100
+++ b/Makefile.am	Mon Oct 18 11:29:08 2010 +0200
@@ -321,7 +321,8 @@
 	patches/shark-debug-option.patch \
 	patches/icedtea-shark.patch \
 	patches/icedtea-linux-separate-debuginfo.patch \
-	patches/openjdk/6951319-sparc_build_fixes.patch
+	patches/openjdk/6951319-sparc_build_fixes.patch \
+	patches/openjdk/6853592-badwindow-warning-fix.patch
 endif
 
 if WITH_RHINO
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6853592-badwindow-warning-fix.patch	Mon Oct 18 11:29:08 2010 +0200
@@ -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();
+-                }
+             }
+         });
+     }