From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 12 May 2010 19:49:26 +0000 (+0000)
Subject: Multiple TCK failures. Child containers are started during the STARTING_PREP state... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1d890b1cf5c826820f00e84655fd4cf42345e49d;p=tomcat7.0

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.

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 c9d61b81d..99d9f479e 100644
--- 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();