Author: markt
Date: Fri Jul 7 16:13:38 2017
New Revision: 1801186
URL: http://svn.apache.org/viewvc?rev=1801186&view=rev
Log:
Follow-up to r1801151
There is a setResources() method in this class and the super class. The patch
needed to make sure the right setResources() was called.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1801186&r1=1801185&r2=1801186&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Fri
Jul 7 16:13:38 2017
@@ -2687,7 +2687,7 @@ public class StandardContext extends Con
this.webappResources = resources;
// The proxied resources will be refreshed on start
- setResources(null);
+ super.setResources(null);
support.firePropertyChange("resources", oldResources,
this.webappResources);
@@ -5272,7 +5272,7 @@ public class StandardContext extends Con
Registry.getRegistry(null, null).registerComponent
(proxyDirContext.getCache(), resourcesName, null);
}
- setResources(proxyDirContext);
+ super.setResources(proxyDirContext);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error(sm.getString("standardContext.resourcesStart"), t);
@@ -5322,7 +5322,7 @@ public class StandardContext extends Con
ok = false;
}
- setResources(null);
+ super.setResources(null);
return (ok);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
