From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 13 May 2010 20:04:05 +0000 (+0000)
Subject: Essentially revert r943726
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dcb6daf86458447c23d1ccfb1117d80e12eaea9d;p=tomcat7.0

Essentially revert r943726
Children may be added prior to calling Context.start() and they *do* need to be started in that case.

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

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 7079b5f9f..8e72e70ef 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4630,6 +4630,13 @@ public class StandardContext extends ContainerBase
                 // Notify our interested LifecycleListeners
                 fireLifecycleEvent(Lifecycle.CONFIGURE_START_EVENT, null);
                 
+                // Start our child containers, if not already started
+                for (Container child : findChildren()) {
+                    if (!child.getState().isAvailable()) {
+                        child.start();
+                    }
+                }
+
                 // Start the Valves in our pipeline (including the basic),
                 // if any
                 if (pipeline instanceof Lifecycle) {