You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/11/11 13:29:40 UTC
svn commit: r1033912 - in /tomcat/trunk:
java/org/apache/catalina/core/StandardContext.java
java/org/apache/catalina/core/StandardWrapper.java webapps/docs/changelog.xml
Author: markt
Date: Thu Nov 11 12:29:40 2010
New Revision: 1033912
URL: http://svn.apache.org/viewvc?rev=1033912&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50169
Ensure that when a Container is started that it doesn't try and register with the mapper unless its parent has already started.
Patch provided by Eiji Takahashi.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1033912&r1=1033911&r2=1033912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Nov 11 12:29:40 2010
@@ -3033,8 +3033,8 @@ public class StandardContext extends Con
welcomeFiles = results;
}
postWelcomeFiles();
- fireContainerEvent(ADD_WELCOME_FILE_EVENT, name);
-
+ if(this.getState().equals(LifecycleState.STARTED))
+ fireContainerEvent(ADD_WELCOME_FILE_EVENT, name);
}
@@ -4127,7 +4127,8 @@ public class StandardContext extends Con
// Inform interested listeners
postWelcomeFiles();
- fireContainerEvent(REMOVE_WELCOME_FILE_EVENT, name);
+ if(this.getState().equals(LifecycleState.STARTED))
+ fireContainerEvent(REMOVE_WELCOME_FILE_EVENT, name);
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1033912&r1=1033911&r2=1033912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu Nov 11 12:29:40 2010
@@ -53,6 +53,7 @@ import org.apache.catalina.Globals;
import org.apache.catalina.InstanceEvent;
import org.apache.catalina.InstanceListener;
import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleState;
import org.apache.catalina.Wrapper;
import org.apache.catalina.mbeans.MBeanUtils;
import org.apache.catalina.security.SecurityUtil;
@@ -737,7 +738,8 @@ public class StandardWrapper extends Con
synchronized (mappings) {
mappings.add(mapping);
}
- fireContainerEvent(ADD_MAPPING_EVENT, mapping);
+ if(parent.getState().equals(LifecycleState.STARTED))
+ fireContainerEvent(ADD_MAPPING_EVENT, mapping);
}
@@ -1198,7 +1200,8 @@ public class StandardWrapper extends Con
synchronized (mappings) {
mappings.remove(mapping);
}
- fireContainerEvent(REMOVE_MAPPING_EVENT, mapping);
+ if(parent.getState().equals(LifecycleState.STARTED))
+ fireContainerEvent(REMOVE_MAPPING_EVENT, mapping);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1033912&r1=1033911&r2=1033912&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 11 12:29:40 2010
@@ -87,6 +87,11 @@
ensure that <code>Context</code> objects are only destroyed once.
(markt)
</fix>
+ <fix>
+ <bug>50169</bug>: Ensure that when a Container is started that it
+ doesn't try and register with the mapper unless its parent has
+ already started. Patch provided by Eiji Takahashi. (markt)
+ </fix>
<add>
<bug>50222</bug>: Modify memory leak prevention code so it pins the
system class loader in memory rather than than the common class loader,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org