Author: markt
Date: Mon Dec 16 15:46:02 2013
New Revision: 1551238
URL: http://svn.apache.org/r1551238
Log:
jndi: URLS are no longer used. Remove some unused code.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
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=1551238&r1=1551237&r2=1551238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Mon Dec 16
15:46:02 2013
@@ -575,7 +575,7 @@ public class WebappLoader extends Lifecy
}
while (loader != null) {
- if (!buildClassPath(servletContext, classpath, loader)) {
+ if (!buildClassPath(classpath, loader)) {
break;
}
loader = loader.getParent();
@@ -585,7 +585,7 @@ public class WebappLoader extends Lifecy
// Delegation was enabled, go back and add the webapp paths
loader = getClassLoader();
if (loader != null) {
- buildClassPath(servletContext, classpath, loader);
+ buildClassPath(classpath, loader);
}
}
@@ -596,8 +596,7 @@ public class WebappLoader extends Lifecy
}
- private boolean buildClassPath(ServletContext servletContext,
- StringBuilder classpath, ClassLoader loader) {
+ private boolean buildClassPath(StringBuilder classpath, ClassLoader
loader) {
if (loader instanceof URLClassLoader) {
URL repositories[] =
((URLClassLoader) loader).getURLs();
@@ -607,9 +606,6 @@ public class WebappLoader extends Lifecy
repository = utf8Decode(repository.substring(7));
else if (repository.startsWith("file:"))
repository = utf8Decode(repository.substring(5));
- else if (repository.startsWith("jndi:"))
- repository =
-
servletContext.getRealPath(repository.substring(5));
else
continue;
if (repository == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
