aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d4a0db2..c60e2c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-21 Adam Domurad <[email protected]>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (getPermissions): avoid potential NPE if code source location is
+ missing
+
2013-02-14 Adam Domurad <[email protected]>
PR835: javaws leaks connections
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index 73de95f..66dad2f 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -1144,7 +1144,7 @@ public class JNLPClassLoader extends URLClassLoader {
}
// Class from host X should be allowed to connect to host X
- if (cs.getLocation().getHost().length() > 0)
+ if (cs.getLocation() != null && cs.getLocation().getHost().length() > 0)
result.add(new SocketPermission(cs.getLocation().getHost(),
"connect, accept"));