Author: markt
Date: Fri Mar 25 21:59:07 2011
New Revision: 1085574
URL: http://svn.apache.org/viewvc?rev=1085574&view=rev
Log:
Don't register Contexts that fail to start with the Mapper.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1085574&r1=1085573&r2=1085574&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Fri Mar
25 21:59:07 2011
@@ -290,7 +290,9 @@ public class MapperListener extends Life
mapper.addHost(host.getName(), aliases, host);
for (Container container : host.findChildren()) {
- registerContext((Context) container);
+ if (container.getState().isAvailable()) {
+ registerContext((Context) container);
+ }
}
if(log.isDebugEnabled()) {
log.debug(sm.getString("mapperListener.registerHost",
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1085574&r1=1085573&r2=1085574&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Mar 25 21:59:07 2011
@@ -91,6 +91,9 @@
(greater than 100ms) at INFO level and provide a value for the message
key so a meaningful message appears in the logs. (markt)
</fix>
+ <fix>
+ Don't register Contexts that fail to start with the Mapper.
(markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
