Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Fix bugs with child-first behaviour.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@209244 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2005-07-05 08:49:54 +00:00
parent b1f4809445
commit ab117df3c7
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/test/org/apache/commons/logging/PathableClassLoader.java
View File

@@ -32,6 +32,10 @@ import java.io.IOException;
/**
* A ClassLoader which sees only the specified classes.
* <p>
* Note that this classloader is not "industrial strength"; users
* looking for such a class may wish to look at the Tomcat sourcecode
* instead. In particular, this class may not be threadsafe.
*/
public class PathableClassLoader extends URLClassLoader {
@@ -174,9 +178,18 @@ public class PathableClassLoader extends URLClassLoader {
if (parentFirst) {
return super.loadClass(name, resolve);
} else {
// ok, implement child-first
// Implement child-first.
//
// It appears that the findClass method doesn't check whether the
// class has already been loaded. This seems odd to me, but without
// first checking via findLoadedClass we can get java.lang.LinkageError
// with message "duplicate class definition" which isn't good.
try {
Class clazz = super.findClass(name);
Class clazz = findLoadedClass(name);
if (clazz == null) {
clazz = super.findClass(name);
}
if (resolve) {
resolveClass(clazz);
}
@@ -236,23 +249,32 @@ public class PathableClassLoader extends URLClassLoader {
if (parentFirst) {
return super.getResources(name);
} else {
Enumeration local = super.findResources(name);
Enumeration parent = getParent().getResources(name);
Enumeration localResources = super.findResources(name);
ClassLoader parentLoader = getParent();
if (parentLoader == null) {
// There is no way, as far as I am aware, to call
// getResources on the bootclassloader. The Class
// class has methods getResource and getResourceAsStream
// but not getResources. So I guess we just assume there
// aren't any matches in the bootloader..
return localResources;
}
Enumeration parentResources = parentLoader.getResources(name);
if (!local.hasMoreElements()) {
return parent;
if (!localResources.hasMoreElements()) {
return parentResources;
}
if (!parent.hasMoreElements()) {
return local;
if (!parentResources.hasMoreElements()) {
return localResources;
}
Vector v = new Vector();
while (local.hasMoreElements()) {
v.add(local.nextElement());
while (localResources.hasMoreElements()) {
v.add(localResources.nextElement());
}
while (parent.hasMoreElements()) {
v.add(parent.nextElement());
while (parentResources.hasMoreElements()) {
v.add(parentResources.nextElement());
}
return v.elements();
}