Mercurial > hg > release > icedtea6-1.10
changeset 2535:d0a7b63adce9
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.
| author | Deepak Bhole <dbhole@redhat.com> |
|---|---|
| date | Tue, 30 Aug 2011 11:30:12 -0400 |
| parents | 6fcb75989c4a |
| children | 4981a9f3be28 |
| files | ChangeLog Makefile.am NEWS patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch |
| diffstat | 4 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 24 11:58:13 2011 +0200 +++ b/ChangeLog Tue Aug 30 11:30:12 2011 -0400 @@ -1,3 +1,12 @@ +2011-08-30 Deepak Bhole <dbhole@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-24 Xerxes Rånby <xerxes@zafena.se> Zero/Shark
--- a/Makefile.am Wed Aug 24 11:58:13 2011 +0200 +++ b/Makefile.am Tue Aug 30 11:30:12 2011 -0400 @@ -348,7 +348,8 @@ patches/fonts-rhel-version.patch \ patches/openjdk/7036148-npe-null-jmenu-name.patch \ patches/jtreg-bug7036148-test.patch \ - patches/support_linux_3.patch + patches/support_linux_3.patch \ + patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \
--- a/NEWS Wed Aug 24 11:58:13 2011 +0200 +++ b/NEWS Tue Aug 30 11:30:12 2011 -0400 @@ -14,6 +14,8 @@ * Zero/Shark - PR690: Shark fails to JIT using hs20. - PR696: Zero fails to handle fast_aldc and fast_aldc_w in hs20. +* Backports + - S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog New in release 1.10.3 (2011-07-21):
--- /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();