/hg/icedtea6: S6826104, RH730015: Getting a NullPointer exceptio...

[dbhole at icedtea.classpath.org]

changeset b9ac502a6189 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b9ac502a6189
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Aug 30 11:30:12 2011 -0400

	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.pa
	tch: New patch that fixes S6826104.


diffstat:

 ChangeLog                                                               |   9 +++++
 Makefile.am                                                             |   3 +-
 NEWS                                                                    |   1 +
 patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch |  16 ++++++++++
 4 files changed, 28 insertions(+), 1 deletions(-)

diffs (61 lines):

diff -r 9468557f98c0 -r b9ac502a6189 ChangeLog
--- a/ChangeLog	Tue Aug 30 12:30:04 2011 +0200
+++ b/ChangeLog	Tue Aug 30 11:30:12 2011 -0400
@@ -1,3 +1,12 @@
+2011-08-30  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-30  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	CACAO
diff -r 9468557f98c0 -r b9ac502a6189 Makefile.am
--- a/Makefile.am	Tue Aug 30 12:30:04 2011 +0200
+++ b/Makefile.am	Tue Aug 30 11:30:12 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 9468557f98c0 -r b9ac502a6189 NEWS
--- a/NEWS	Tue Aug 30 12:30:04 2011 +0200
+++ b/NEWS	Tue Aug 30 11:30:12 2011 -0400
@@ -368,6 +368,7 @@
   - S7036582: Improve test coverage of java.math.BigDecimal
   - S6806261: BigDecimal.longValueExact() method throws NullPointerException
   - S6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) throws StackOverflowError
+  - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog
 * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
 * CACAO
   - CA149: Used wrong class loader.
diff -r 9468557f98c0 -r b9ac502a6189 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	Tue Aug 30 11:30:12 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();