|
@@ -706,26 +706,26 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { |
|
|
if (isParentFirst(name)) { |
|
|
if (isParentFirst(name)) { |
|
|
resourceStream = loadBaseResource(name); |
|
|
resourceStream = loadBaseResource(name); |
|
|
} |
|
|
} |
|
|
|
|
|
if (resourceStream != null) { |
|
|
|
|
|
log("ResourceStream for " + name |
|
|
|
|
|
+ " loaded from parent loader", Project.MSG_DEBUG); |
|
|
|
|
|
} else { |
|
|
|
|
|
resourceStream = loadResource(name); |
|
|
if (resourceStream != null) { |
|
|
if (resourceStream != null) { |
|
|
log("ResourceStream for " + name |
|
|
log("ResourceStream for " + name |
|
|
+ " loaded from parent loader", Project.MSG_DEBUG); |
|
|
|
|
|
} else { |
|
|
|
|
|
resourceStream = loadResource(name); |
|
|
|
|
|
if (resourceStream != null) { |
|
|
|
|
|
log("ResourceStream for " + name |
|
|
|
|
|
+ " loaded from ant loader", Project.MSG_DEBUG); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
+ " loaded from ant loader", Project.MSG_DEBUG); |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
if (resourceStream == null && !isParentFirst(name)) { |
|
|
if (resourceStream == null && !isParentFirst(name)) { |
|
|
if (ignoreBase) { |
|
|
if (ignoreBase) { |
|
|
resourceStream = getRootLoader() == null ? null : getRootLoader().getResourceAsStream(name); |
|
|
resourceStream = getRootLoader() == null ? null : getRootLoader().getResourceAsStream(name); |
|
|
} else { |
|
|
} else { |
|
|
resourceStream = loadBaseResource(name); |
|
|
resourceStream = loadBaseResource(name); |
|
|
} |
|
|
} |
|
|
if (resourceStream != null) { |
|
|
|
|
|
log("ResourceStream for " + name + " loaded from parent loader", |
|
|
|
|
|
Project.MSG_DEBUG); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (resourceStream != null) { |
|
|
|
|
|
log("ResourceStream for " + name + " loaded from parent loader", |
|
|
|
|
|
Project.MSG_DEBUG); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (resourceStream == null) { |
|
|
if (resourceStream == null) { |
|
|
log("Couldn't load ResourceStream for " + name, Project.MSG_DEBUG); |
|
|
log("Couldn't load ResourceStream for " + name, Project.MSG_DEBUG); |
|
|