/hg/icedtea6: netx: check for possible null in splash screen code

[omajid at icedtea.classpath.org]

changeset fe7d70ac2b1a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fe7d70ac2b1a
author: omajid
date: Fri Aug 20 17:06:32 2010 -0400

	netx: check for possible null in splash screen code

	2010-08-19 Omair Majid <omajid at redhat.com>

	 Fixes rhbz601281
	    * NEWS: Update with this fix.
	    * netx/net/sourceforge/jnlp/JNLPSplashScreen.java
	(setSplashImageURL): Check for possible null.


diffstat:

3 files changed, 15 insertions(+)
ChangeLog                                       |    7 +++++++
NEWS                                            |    2 ++
netx/net/sourceforge/jnlp/JNLPSplashScreen.java |    6 ++++++

diffs (42 lines):

diff -r 552e98f1c215 -r fe7d70ac2b1a ChangeLog
--- 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-13  Andrew John Hughes  <ahughes
+2010-08-19  Omair Majid  <omajid at 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 at redhat.com>
 
 	* patches/ecj/javah.patch: Moved to...
diff -r 552e98f1c215 -r fe7d70ac2b1a NEWS
--- a/NEWS	Fri Aug 13 23:28:38 2010 +0100
+++ b/NEWS	Fri Aug 20 17:06:32 2010 -0400
@@ -12,6 +12,8 @@ New in release 1.10 (2010-XX-XX):
 * 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):
 
diff -r 552e98f1c215 -r fe7d70ac2b1a netx/net/sourceforge/jnlp/JNLPSplashScreen.java
--- 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 @@ public class JNLPSplashScreen extends JF
         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);