Mercurial > hg > release > icedtea6-1.11
changeset 2926:44c41a07b14d
Fix naming of patch.
2013-08-06 Andrew John Hughes <gnu.andrew@redhat.com>
* 8013196-TimeZone_getDefault_throws_exception.patch:
Renamed to...
* 8013196-timezone_getdefault_throws_exception.patch:
...this.
* Makefile.am:
(ICEDTEA_PATCHES): Fix name of patch.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Tue, 03 Sep 2013 18:37:53 +0100 |
parents | c93101925a2e |
children | ab73a2646f3c |
files | ChangeLog Makefile.am patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch patches/openjdk/8013196-timezone_getdefault_throws_exception.patch |
diffstat | 4 files changed, 49 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Sep 03 18:35:49 2013 +0100 +++ b/ChangeLog Tue Sep 03 18:37:53 2013 +0100 @@ -1,3 +1,12 @@ +2013-08-06 Andrew John Hughes <gnu.andrew@redhat.com> + + * 8013196-TimeZone_getDefault_throws_exception.patch: + Renamed to... + * 8013196-timezone_getdefault_throws_exception.patch: + ...this. + * Makefile.am: + (ICEDTEA_PATCHES): Fix name of patch. + 2013-08-05 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Tue Sep 03 18:35:49 2013 +0100 +++ b/Makefile.am Tue Sep 03 18:37:53 2013 +0100 @@ -630,7 +630,7 @@ patches/openjdk/8012112-MlibOpsTest_fails.patch \ patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch \ patches/openjdk/8012933-appcontext_disposed_too_early.patch \ - patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch \ + patches/openjdk/8013196-timezone_getdefault_throws_exception.patch \ patches/openjdk/8014427-raster_regression.patch \ patches/openjdk/8010727-empty_logger_name.patch \ patches/openjdk/8010939-logmanager_deadlock.patch \
--- a/patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch Tue Sep 03 18:35:49 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -# HG changeset patch -# User coffeys -# Date 1367438524 -3600 -# Node ID 0f93d6b18a16bf893b152a46df0e22e32666f7ce -# Parent 55eaa0da2a8f6d9fe4966d3d9940258a1b0d4399 -8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() -Reviewed-by: mchung, okutsu - ---- openjdk/jdk/src/share/classes/sun/awt/AppContext.java -+++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java -@@ -813,16 +813,24 @@ - static { - sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() { - public Object get(Object key) { -- return getAppContext().get(key); -+ AppContext ac = getAppContext(); -+ return (ac == null) ? null : ac.get(key); - } - public void put(Object key, Object value) { -- getAppContext().put(key, value); -+ AppContext ac = getAppContext(); -+ if (ac != null) { -+ ac.put(key, value); -+ } - } - public void remove(Object key) { -- getAppContext().remove(key); -+ AppContext ac = getAppContext(); -+ if (ac != null) { -+ ac.remove(key); -+ } - } - public boolean isDisposed() { -- return getAppContext().isDisposed(); -+ AppContext ac = getAppContext(); -+ return (ac == null) ? true : ac.isDisposed(); - } - public boolean isMainAppContext() { - return (numAppContexts.get() == 1 && mainAppContext != null);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8013196-timezone_getdefault_throws_exception.patch Tue Sep 03 18:37:53 2013 +0100 @@ -0,0 +1,39 @@ +# HG changeset patch +# User coffeys +# Date 1367438524 -3600 +# Node ID 0f93d6b18a16bf893b152a46df0e22e32666f7ce +# Parent 55eaa0da2a8f6d9fe4966d3d9940258a1b0d4399 +8013196: TimeZone.getDefault() throws NPE due to sun.awt.AppContext.getAppContext() +Reviewed-by: mchung, okutsu + +--- openjdk/jdk/src/share/classes/sun/awt/AppContext.java ++++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java +@@ -813,16 +813,24 @@ + static { + sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() { + public Object get(Object key) { +- return getAppContext().get(key); ++ AppContext ac = getAppContext(); ++ return (ac == null) ? null : ac.get(key); + } + public void put(Object key, Object value) { +- getAppContext().put(key, value); ++ AppContext ac = getAppContext(); ++ if (ac != null) { ++ ac.put(key, value); ++ } + } + public void remove(Object key) { +- getAppContext().remove(key); ++ AppContext ac = getAppContext(); ++ if (ac != null) { ++ ac.remove(key); ++ } + } + public boolean isDisposed() { +- return getAppContext().isDisposed(); ++ AppContext ac = getAppContext(); ++ return (ac == null) ? true : ac.isDisposed(); + } + public boolean isMainAppContext() { + return (numAppContexts.get() == 1 && mainAppContext != null);