RFC: Patch to fix regression in 1.10 (S6826104/RH730015)

[Deepak Bhole]

Hi,

This patch fixes S6826104/RH730015: Getting a NullPointer exception when
clicked on Application & Toolkit Modal dialog.

The bug does not exist in upstream OpenJDK6 and is a regression in
IcedTea6 caused by 6693253-security_warning.patch. That fix was also
applied to OpenJDK7, which caused S6826104 which was subsequently fixed:
http://hg.openjdk.java.net/jdk7/awt/jdk/rev/c6503f2a93d1

Attached patch contains the above fix.

1.10 and HEAD are affected. Okay for both?

Cheers,
Deepak
-------------- next part --------------
diff -r 759b17771e6a ChangeLog
--- a/ChangeLog	Fri Aug 19 13:36:29 2011 +0200
+++ b/ChangeLog	Mon Aug 29 17:10:15 2011 -0400
@@ -1,3 +1,12 @@
+2011-08-29  Deepak Bhole <dbhole at redhat.com>
+
+	S6826104, RH730015: Getting a NullPointer exception when clicked on Application &
+	Toolkit Modal dialog
+	* Makefile.am: Apply new patch for S6826104. 
+	* NEWS: Updated.
+	* patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch:
+	New patch that fixes S6826104.
+
 2011-08-19  Xerxes R?nby  <xerxes at zafena.se>
 
 	JamVM
diff -r 759b17771e6a Makefile.am
--- a/Makefile.am	Fri Aug 19 13:36:29 2011 +0200
+++ b/Makefile.am	Mon Aug 29 17:10:15 2011 -0400
@@ -376,7 +376,8 @@
 	patches/pr690-shark-jit-hs20.patch \
 	patches/pr696-zero-fast_aldc-hs20.patch \
 	patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch \
-	patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch
+	patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch \
+	patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 759b17771e6a NEWS
--- a/NEWS	Fri Aug 19 13:36:29 2011 +0200
+++ b/NEWS	Mon Aug 29 17:10:15 2011 -0400
@@ -20,6 +20,7 @@
   - PR744: icedtea6-1.10.2 : patching error
   - PR752: ImageFormatException extends Exception not RuntimeException
   - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
+  - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog
 * Import of OpenJDK6 b22 including upgrade to HotSpot 20
   - S7023111: Add webrev script to make/scripts
   - S6909331: Add vsvars.sh to the jdk repository (handy cygwin way to get vcvars32.bat run)
diff -r 759b17771e6a patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch	Mon Aug 29 17:10:15 2011 -0400
@@ -0,0 +1,17 @@
+diff -ur openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
+--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	2011-08-11 13:38:17.829462436 -0400
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java	2011-08-11 13:41:05.611491530 -0400
+@@ -149,6 +149,13 @@
+ 
+         params.put(OVERRIDE_REDIRECT, Boolean.valueOf(isOverrideRedirect()));
+ 
++        SunToolkit.awtLock();
++        try {
++            windows.add(this);
++        } finally {
++            SunToolkit.awtUnlock();
++        }
++
+         cachedFocusableWindow = isFocusableWindow();
+ 
+         Font f = target.getFont();