Author: markt
Date: Wed Feb 17 23:22:53 2016
New Revision: 1730975
URL: http://svn.apache.org/viewvc?rev=1730975&view=rev
Log:
Fix a couple of regressions highlighted by unit tests in r1730946
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1730975&r1=1730974&r2=1730975&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Wed
Feb 17 23:22:53 2016
@@ -2417,12 +2417,12 @@ public abstract class WebappClassLoaderB
WebResource webResource = entry.webResource;
if (webResource == null) {
- webResource = resources.getResource(path);
+ webResource = resources.getClassLoaderResource(path);
} else {
entry.webResource = null;
}
- if (webResource == null) {
+ if (!webResource.exists()) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
