# HG changeset patch
# User Omair Majid <omajid@redhat.com>
# Date 1298420371 18000
# Node ID ce4eb836f5920750fd211e3c19f5dcc92b754e02
# Parent  a7550fb352c5baf80507d206cfd25030961ff47e
Fix PR638: JNLPClassLoader.loadClass(String name) can return null

2011-02-22  Omair Majid  <omajid@redhat.com>
            Mark Greenwood <mark@dcs.shef.ac.uk>

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

diff -r a7550fb352c5 -r ce4eb836f592 AUTHORS
--- a/AUTHORS	Tue Feb 15 17:06:34 2011 -0500
+++ b/AUTHORS	Tue Feb 22 19:19:31 2011 -0500
@@ -4,6 +4,7 @@
 Lillian Angel <langel@redhat.com>
 Deepak Bhole <dbhole@redhat.com>
 Thomas Fitzsimmons <fitzsim@redhat.com>
+Mark Greenwood <mark@dcs.shef.ac.uk>
 Andrew John Hughes <gnu_andrew@member.fsf.org, ahughes@redhat.com>
 Matthias Klose <doko@ubuntu.com>
 Francis Kung <fkung@redhat.com>
diff -r a7550fb352c5 -r ce4eb836f592 ChangeLog
--- a/ChangeLog	Tue Feb 15 17:06:34 2011 -0500
+++ b/ChangeLog	Tue Feb 22 19:19:31 2011 -0500
@@ -1,3 +1,12 @@
+2011-02-22  Omair Majid  <omajid@redhat.com>
+            Mark Greenwood <mark@dcs.shef.ac.uk>
+
+	Fix PR638
+	* NEWS: Update with fix.
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (loadClass): Throw
+	ClassNotFoundException instead of returning null.
+	* AUTHORS: Update.
+
 2011-02-11  Deepak Bhole <dbhole@redhat.com>
 
 	* NEWS: Add 1.0.2
diff -r a7550fb352c5 -r ce4eb836f592 NEWS
--- a/NEWS	Tue Feb 15 17:06:34 2011 -0500
+++ b/NEWS	Tue Feb 22 19:19:31 2011 -0500
@@ -9,6 +9,8 @@
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
 New in release 1.0.2 (2011-XX-XX):
+* Common Fixes and Improvements
+  - PR638: JNLPClassLoader.loadClass(String name) can return null
 
 New in release 1.0.1 (2011-02-15):
 
diff -r a7550fb352c5 -r ce4eb836f592 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Feb 15 17:06:34 2011 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Feb 22 19:19:31 2011 -0500
@@ -1042,6 +1042,10 @@
                 }
             }
 
+        if (result == null) {
+            throw new ClassNotFoundException(name);
+        }
+
         return result;
     }