/hg/icedtea-web: Fixed bug in previous commit for PR861

[dbhole at icedtea.classpath.org]

changeset 70a30f21de45 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=70a30f21de45
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Jun 07 11:12:03 2012 -0400

	Fixed bug in previous commit for PR861


diffstat:

 ChangeLog                                              |   6 ++++++
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 954131311826 -r 70a30f21de45 ChangeLog
--- a/ChangeLog	Tue Jun 05 10:11:09 2012 -0400
+++ b/ChangeLog	Thu Jun 07 11:12:03 2012 -0400
@@ -1,3 +1,9 @@
+2012-06-06  Deepak Bhole <dbhole at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(getAccessControlContextForClassLoading): Iterate over codebase URLs only
+	if codeBaseLoader is not null.
+
 2012-06-05  Deepak Bhole <dbhole at redhat.com>
 
 	PR861: Allow loading from non codebase hosts. Allow code to connect to
diff -r 954131311826 -r 70a30f21de45 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Jun 05 10:11:09 2012 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Jun 07 11:12:03 2012 -0400
@@ -1990,10 +1990,12 @@
                                                  "connect, accept"));
         }
 
-        // Permissions for codebase urls
-        for (URL u : codeBaseLoader.getURLs()) {
-            permissions.add(new SocketPermission(u.getHost(),
-                    "connect, accept"));
+        // Permissions for codebase urls (if there is a loader)
+        if (codeBaseLoader != null) {
+            for (URL u : codeBaseLoader.getURLs()) {
+                permissions.add(new SocketPermission(u.getHost(),
+                        "connect, accept"));
+            }
         }
 
         ProtectionDomain pd = new ProtectionDomain(null, permissions);