/hg/icedtea-web: PR724: Possible NullPointerException in JNLPCla...

[omajid at icedtea.classpath.org]

changeset cce92a1211ae in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cce92a1211ae
author: Omair Majid <omajid at redhat.com>
date: Fri May 27 12:45:05 2011 -0400

	PR724: Possible NullPointerException in
	JNLPClassLoader.getClassPathsFromManifest

	2011-05-27 Omair Majid <omajid at redhat.com>

	 * NEWS: Update.
	    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
	(getClassPathsFromManifest): Check for possible nulls and empty
	strings.


diffstat:

 ChangeLog                                              |  6 ++++++
 NEWS                                                   |  1 +
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  3 +++
 3 files changed, 10 insertions(+), 0 deletions(-)

diffs (37 lines):

diff -r 762fa13583b2 -r cce92a1211ae ChangeLog
--- a/ChangeLog	Fri May 27 12:32:52 2011 -0400
+++ b/ChangeLog	Fri May 27 12:45:05 2011 -0400
@@ -1,3 +1,9 @@
+2011-05-27  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Update.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(getClassPathsFromManifest): Check for possible nulls and empty strings.
+
 2011-05-26  Andrew Su  <asu at redhat.com>
 
 	* NEWS: Update.
diff -r 762fa13583b2 -r cce92a1211ae NEWS
--- a/NEWS	Fri May 27 12:32:52 2011 -0400
+++ b/NEWS	Fri May 27 12:45:05 2011 -0400
@@ -21,6 +21,7 @@
   - PR497: Mercurial revision detection not very reliable
   - PR638: JNLPClassLoader.loadClass(String name) can return null
   - RH677772: NoSuchAlgorithmException using SSL/TLS in javaws
+  - PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest
 * NetX
   - Use Firefox's proxy settings if possible
   - The user's default browser (determined from xdg-open or $BROWSER) is used
diff -r 762fa13583b2 -r cce92a1211ae netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri May 27 12:32:52 2011 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Fri May 27 12:45:05 2011 -0400
@@ -1375,6 +1375,9 @@
         if (mf != null) {
             // extract the Class-Path entries from the manifest and split them
             String classpath = mf.getMainAttributes().getValue("Class-Path");
+            if (classpath == null || classpath.trim().length() == 0) {
+                return result;
+            }
             String[] paths = classpath.split(" +");
             for (String path : paths) {
                 if (path.trim().length() == 0) {