Mercurial > hg > icedtea6
changeset 2236:fe7d70ac2b1a
netx: check for possible null in splash screen code
2010-08-19 Omair Majid <omajid@redhat.com>
Fixes rhbz601281
* NEWS: Update with this fix.
* netx/net/sourceforge/jnlp/JNLPSplashScreen.java
(setSplashImageURL): Check for possible null.
| author | omajid |
|---|---|
| date | Fri, 20 Aug 2010 17:06:32 -0400 |
| parents | 552e98f1c215 |
| children | fa8c9bfd3da5 |
| files | ChangeLog NEWS netx/net/sourceforge/jnlp/JNLPSplashScreen.java |
| diffstat | 3 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Aug 13 23:28:38 2010 +0100 +++ b/ChangeLog Fri Aug 20 17:06:32 2010 -0400 @@ -1,3 +1,10 @@ +2010-08-19 Omair Majid <omajid@redhat.com> + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + 2010-08-13 Andrew John Hughes <ahughes@redhat.com> * patches/ecj/javah.patch: Moved to...
--- a/NEWS Fri Aug 13 23:28:38 2010 +0100 +++ b/NEWS Fri Aug 20 17:06:32 2010 -0400 @@ -12,6 +12,8 @@ * Backports from OpenJDK6 - S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts - S6954424: Support OpenType/CFF fonts in JDK 7 +* Netx + - RH601281: Possible NullPointerException in splash screen code New in release 1.9 (2010-XX-XX):
--- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Fri Aug 13 23:28:38 2010 +0100 +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Fri Aug 20 17:06:32 2010 -0400 @@ -44,6 +44,12 @@ try { splashImage = ImageIO.read(resourceTracker .getCacheFile(splashImageUrl)); + if (splashImage == null) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + return; + } } catch (IOException e) { if (JNLPRuntime.isDebug()) { System.err.println("Error loading splash image: " + url);