Multiple TCK failures. Child containers are started during the STARTING_PREP state...

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@943657 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index c9d61b8..99d9f47 100644 (file)
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -773,7 +773,9 @@ public abstract class ContainerBase extends LifecycleMBeanBase
             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();