Author: violetagg
Date: Thu Mar 21 11:19:53 2013
New Revision: 1459225
URL: http://svn.apache.org/r1459225
Log:
Ensure that StandardJarScanner#scan will use the provided class loader when
scanning the class loader hierarchy.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1459225&r1=1459224&r2=1459225&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
Thu Mar 21 11:19:53 2013
@@ -188,13 +188,12 @@ public class StandardJarScanner implemen
}
// Scan the classpath
- if (scanClassPath) {
+ if (scanClassPath && classloader != null) {
if (log.isTraceEnabled()) {
log.trace(sm.getString("jarScan.classloaderStart"));
}
- ClassLoader loader =
- Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = classloader;
ClassLoader stopLoader = null;
if (!scanBootstrapClassPath) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1459225&r1=1459224&r2=1459225&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Mar 21 11:19:53 2013
@@ -100,6 +100,10 @@
Deprecate Tomcat's internal Base 64 encoder/decoder and switch to
using the JRE provided implementation. (markt)
</scode>
+ <fix>
+ Ensure that StandardJarScanner#scan will use the provided class loader
+ when scanning the class loader hierarchy. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
