Mercurial > hg > release > icedtea-web-1.3
changeset 424:70a30f21de45
Fixed bug in previous commit for PR861
| author | Deepak Bhole <dbhole@redhat.com> |
|---|---|
| date | Thu, 07 Jun 2012 11:12:03 -0400 |
| parents | 954131311826 |
| children | e696a47c3b89 |
| files | ChangeLog netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@redhat.com> PR861: Allow loading from non codebase hosts. Allow code to connect to
--- 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);