Author: markt
Date: Fri Apr 26 20:57:33 2013
New Revision: 1476401
URL: http://svn.apache.org/r1476401
Log:
Fix double start of Resources noticed while investigating CI unit test failures
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1476401&r1=1476400&r2=1476401&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Apr 26
20:57:33 2013
@@ -4870,7 +4870,11 @@ public class StandardContext extends Con
resources.setCacheMaxSize(getCacheMaxSize());
resources.setCacheMaxObjectSize(getCacheObjectMaxSize());
- resources.start();
+ // May have been started (but not fully configured) in init() so no
need
+ // to start the resources if they are already available
+ if (!resources.getState().isAvailable()) {
+ resources.start();
+ }
if (effectiveMajorVersion >=3 && addWebinfClassesResources) {
WebResource webinfClassesResource = resources.getResource(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
