Fix PR638: JNLPClassLoader.loadClass(String name) can return null

2011-02-22  Omair Majid  <[email protected]>
            Mark Greenwood <[email protected]>

    Fix PR638
    * NEWS: Update with fix.
    * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (loadClass): Throw
    ClassNotFoundException instead of returning null.
    * AUTHORS: Update.

4 files changed, 16 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
index ff65540..2d406bb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ Please keep this list in alphabetical order.
 Lillian Angel <[email protected]>
 Deepak Bhole <[email protected]>
 Thomas Fitzsimmons <[email protected]>
+Mark Greenwood <[email protected]>
 Andrew John Hughes <[email protected], [email protected]>
 Matthias Klose <[email protected]>
 Francis Kung <[email protected]>
diff --git a/ChangeLog b/ChangeLog
index 6bb93eb..9ed7946 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
 2011-02-22  Omair Majid  <[email protected]>
+            Mark Greenwood <[email protected]>
+
+	Fix PR638
+	* NEWS: Update with fix.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (loadClass): Throw
+	ClassNotFoundException instead of returning null.
+	* AUTHORS: Update.
+
+2011-02-22  Omair Majid  <[email protected]>
 
 	* Makefile.am (uninstall-local): Fix typo in PACKAGE_NAME.
 
diff --git a/NEWS b/NEWS
index 395f90d..a12ef0c 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ New in release 1.1 (2011-XX-XX):
   - RH677332, CVE-2011-0706: IcedTea multiple signers privilege escalation
 * New Features
   - IcedTea-Web now installs to a FHS-compliant location
+* Common Fixes and Improvements
+  - PR638: JNLPClassLoader.loadClass(String name) can return null
 * NetX
   - Use Firefox's proxy settings if possible
   - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled)
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index 1822c01..da3c4c3 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -1045,6 +1045,10 @@ public class JNLPClassLoader extends URLClassLoader {
                 }
             }
 
+        if (result == null) {
+            throw new ClassNotFoundException(name);
+        }
+
         return result;
     }