From 1d890b1cf5c826820f00e84655fd4cf42345e49d Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 12 May 2010 19:49:26 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/core/ContainerBase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(); -- 2.11.0