/hg/release/icedtea6-1.9: netx: check for possible null in splas...

[omajid at icedtea.classpath.org]

changeset d59cbcab0fe4 in /hg/release/icedtea6-1.9
details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=d59cbcab0fe4
author: omajid
date: Tue Aug 24 10:11:26 2010 -0400

	netx: check for possible null in splash screen code

	2010-08-24 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, 14 insertions(+)
ChangeLog                                       |    7 +++++++
NEWS                                            |    1 +
netx/net/sourceforge/jnlp/JNLPSplashScreen.java |    6 ++++++

diffs (41 lines):

diff -r 933fec08a004 -r d59cbcab0fe4 ChangeLog
--- a/ChangeLog	Mon Aug 23 17:49:28 2010 -0400
+++ b/ChangeLog	Tue Aug 24 10:11:26 2010 -0400
@@ -1,3 +1,10 @@ 2010-08-23  Andrew Su  <asu at redhat.com>
+2010-08-24  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-23  Andrew Su  <asu at redhat.com>
 
         * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diff -r 933fec08a004 -r d59cbcab0fe4 NEWS
--- a/NEWS	Mon Aug 23 17:49:28 2010 -0400
+++ b/NEWS	Tue Aug 24 10:11:26 2010 -0400
@@ -721,6 +721,7 @@ New in release 1.9 (2010-XX-XX):
   - Fix browser command in BasicService.showDocument(URL)
   - Run programs that inherit main(String[]) in their main-class
   - Run JNLP files that use spec version 1.6
+  - RH601281: Possible NullPointerException in splash screen code
 
 New in release 1.8.1 (2010-07-28):
 
diff -r 933fec08a004 -r d59cbcab0fe4 netx/net/sourceforge/jnlp/JNLPSplashScreen.java
--- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java	Mon Aug 23 17:49:28 2010 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java	Tue Aug 24 10:11:26 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);