aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS1
-rw-r--r--netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java9
3 files changed, 18 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cd536fe..b366d6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2010-11-01 Deepak Bhole <[email protected]>
+ PR542: Plugin fails with NPE on
+ http://www.openprocessing.org/visuals/iframe.php?visualID=2615
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (initializeResources): If cacheFile is null (JAR couldn't be downloaded),
+ try to continue, rather than allowing the exception to cause an abort.
+ * NEWS: Updated.
+
+2010-11-01 Deepak Bhole <[email protected]>
+
* plugin/docs: Added new docs folder that contains plugin documentation.
* plugin/docs/MessageBusArchitecture.png: Diagram of the JS <-> Java
message handling architectrure.
diff --git a/NEWS b/NEWS
index ea82ede..4057e37 100644
--- a/NEWS
+++ b/NEWS
@@ -11,3 +11,4 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.0 (2010-XX-XX):
* Initial release of IcedTea-Web
+* PR542: Plugin fails with NPE on http://www.openprocessing.org/visuals/iframe.php?visualID=2615
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index 0960c1a..104bf09 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -462,7 +462,14 @@ public class JNLPClassLoader extends URLClassLoader {
for (JARDesc jarDesc: file.getResources().getJARs()) {
try {
- URL location = tracker.getCacheFile(jarDesc.getLocation()).toURL();
+ File cachedFile = tracker.getCacheFile(jarDesc.getLocation());
+
+ if (cachedFile == null) {
+ System.err.println("JAR " + jarDesc.getLocation() + " not found. Continuing.");
+ continue; // JAR not found. Keep going.
+ }
+
+ URL location = cachedFile.toURL();
SecurityDesc jarSecurity = file.getSecurity();
if (file instanceof PluginBridge) {