Author: markt
Date: Tue Nov 5 00:01:29 2013
New Revision: 1538824
URL: http://svn.apache.org/r1538824
Log:
Class loader is responsible for setting up WEB-INF/classes
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1538824&r1=1538823&r2=1538824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Tue Nov
5 00:01:29 2013
@@ -1524,12 +1524,12 @@ public class WebappClassLoader extends U
public void start() throws LifecycleException {
WebResource classes = resources.getResource("/WEB-INF/classes");
- if (classes.exists()) {
+ if (classes.isDirectory() && classes.canRead()) {
addURL(classes.getURL());
}
WebResource[] jars = resources.listResources("/WEB-INF/lib");
for (WebResource jar : jars) {
- if (jar.getName().endsWith(".jar")) {
+ if (jar.getName().endsWith(".jar") && jar.isFile() &&
jar.canRead()) {
addURL(jar.getURL());
}
}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1538824&r1=1538823&r2=1538824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Tue Nov 5
00:01:29 2013
@@ -664,18 +664,6 @@ public class WebappLoader extends Lifecy
WebResourceRoot resources = context.getResources();
- // Setting up the class repository (/WEB-INF/classes), if it exists
-
- String classesPath = "/WEB-INF/classes";
- WebResource classes = resources.getResource(classesPath);
-
- if (classes.isDirectory()) {
-
- if(log.isDebugEnabled())
- log.debug(sm.getString("webappLoader.classDeploy", classesPath,
- classes.getURL().toExternalForm()));
- }
-
// Setting up the JAR repository (/WEB-INF/lib), if it exists
// TODO Simplify this in a similar manner to WEB-INF/classes
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
