Backport S6826104: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog

[Deepak Bhole]

Hi,

6693253-security_warning.patch introduces a regression that was
subsequently fixed in OpenJDK7 through this changeset:
http://hg.openjdk.java.net/jdk7/awt/jdk/rev/c6503f2a93d1

Corresponding RH bug:
https://bugzilla.redhat.com/show_bug.cgi?id=730015

Attached patch brings the fix into IcedTea6.

Okay for HEAD and 1.10?

ChangeLog:
2011-08-11  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.

Cheers,
Deepak
-------------- next part --------------
diff -r 4c641e5e379d Makefile.am
--- a/Makefile.am	Thu Aug 11 16:48:40 2011 +0200
+++ b/Makefile.am	Thu Aug 11 14:44:16 2011 -0400
@@ -372,7 +372,8 @@
 	patches/openjdk/5047314-Collator_compare_runs_indefinitely.patch \
 	patches/openjdk/6669869-Beans_isDesignTime_should_be_per-AppContext.patch \
 	patches/openjdk/6934356-Vector_writeObject_serialization_DL.patch \
-	patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch
+	patches/openjdk/7036582-Improve_test_coverage_of_BigDecimal.patch \
+	patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 4c641e5e379d NEWS
--- a/NEWS	Thu Aug 11 16:48:40 2011 +0200
+++ b/NEWS	Thu Aug 11 14:44:16 2011 -0400
@@ -19,6 +19,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 4c641e5e379d 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	Thu Aug 11 14:44:16 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();