Author: markt
Date: Wed May 12 19:49:26 2010
New Revision: 943657

URL: http://svn.apache.org/viewvc?rev=943657&view=rev
Log:
Multiple TCK failures. Child containers are started during the STARTING_PREP 
state so if a child whilst the container is in that state, it must also be 
started.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=943657&r1=943656&r2=943657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Wed May 12 
19:49:26 2010
@@ -773,7 +773,9 @@ public abstract class ContainerBase exte
             children.put(child.getName(), child);
 
             // Start child
-            if (getState().isAvailable() && startChildren) {
+            if ((getState().isAvailable() ||
+                    LifecycleState.STARTING_PREP.equals(getState())) &&
+                    startChildren) {
                 boolean success = false;
                 try {
                     child.start();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to