aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Lila <[email protected]>2011-03-23 16:38:33 -0400
committerDenis Lila <[email protected]>2011-03-23 16:38:33 -0400
commit3e70eb2b78afa1529bee6d3e03a60264ac5830c1 (patch)
tree167c6feb3fb45eec0c9fa8659d4d050254e74a4d
parent1ac77343ae60de3557d5ee7f0af029a7609aedb7 (diff)
Don't look into <codebase>/META-INF/ for resources.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS1
-rw-r--r--netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java16
3 files changed, 23 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b5e254..287cd9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-23 Denis Lila <[email protected]>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (findResource, findResources): New functions. Return nothing
+ if name.startsWith("META-INF"). Otherwise delegate to superclass.
+
2011-03-21 Matthias Klose <[email protected]>
* launcher/itweb-settings.in: Use /bin/sh as interpreter.
diff --git a/NEWS b/NEWS
index c8d3cd5..d5c79cb 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ New in release 1.1 (2011-XX-XX):
* Plugin
- PR475, RH604061: Allow applets from the same page to use the same classloader
- PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read)
+ - PR664: Sound doesn't play on runescape.com.
New in release 1.0 (2010-XX-XX):
diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
index 1a41c1d..b90362a 100644
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
@@ -1367,5 +1367,21 @@ public class JNLPClassLoader extends URLClassLoader {
public JNLPClassLoader getParentJNLPClassLoader() {
return parentJNLPClassLoader;
}
+
+ @Override
+ public Enumeration<URL> findResources(String name) throws IOException {
+ if (!name.startsWith("META-INF")) {
+ return super.findResources(name);
+ }
+ return (new Vector<URL>(0)).elements();
+ }
+
+ @Override
+ public URL findResource(String name) {
+ if (!name.startsWith("META-INF")) {
+ return super.findResource(name);
+ }
+ return null;
+ }
}
}