From 06b7548e1cc22689a92e77df742190621a111e9e Mon Sep 17 00:00:00 2001 From: Adam Domurad Date: Tue, 28 Aug 2012 14:36:06 -0400 Subject: Fix for PR920: Classes attempted to load twice when class extends from outside jar --- netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'netx/net/sourceforge/jnlp/runtime') diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java index ef3e5e3..7e28e02 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java @@ -1727,7 +1727,7 @@ public class JNLPClassLoader extends URLClassLoader { // Try codebase loader if (codeBaseLoader != null) - return codeBaseLoader.findClass(name, true); + return codeBaseLoader.findClass(name); // All else failed. Throw CNFE throw new ClassNotFoundException(name); @@ -2201,7 +2201,7 @@ public class JNLPClassLoader extends URLClassLoader { ConcurrentHashMap notFoundResources = new ConcurrentHashMap(); public CodeBaseClassLoader(URL[] urls, JNLPClassLoader cl) { - super(urls); + super(urls, cl); parentJNLPClassLoader = cl; } @@ -2212,19 +2212,6 @@ public class JNLPClassLoader extends URLClassLoader { @Override public Class findClass(String name) throws ClassNotFoundException { - return findClass(name, false); - } - - public Class findClass(String name, boolean recursivelyInvoked) throws ClassNotFoundException { - - if (!recursivelyInvoked) { - try { - return parentJNLPClassLoader.findClass(name); - } catch (ClassNotFoundException cnfe) { - // continue - } - } - // If we have searched this path before, don't try again if (Arrays.equals(super.getURLs(), notFoundResources.get(name))) throw new ClassNotFoundException(name); -- cgit v1.2.3