You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2014/09/09 10:40:56 UTC
svn commit: r1623691 - in /tomcat/trunk:
java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Sep 9 08:40:56 2014
New Revision: 1623691
URL: http://svn.apache.org/r1623691
Log:
When using parallel deployment, correctly undeploy context of old version.
Make sure that never undeploy older Context If current context is not running.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1623691&r1=1623690&r2=1623691&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Sep 9 08:40:56 2014
@@ -1520,7 +1520,7 @@ public class HostConfig
Context previousContext =
(Context) host.findChild(previous.getName());
Context currentContext =
- (Context) host.findChild(previous.getName());
+ (Context) host.findChild(current.getName());
if (previousContext != null && currentContext != null &&
currentContext.getState().isAvailable() &&
!isServiced(previous.getName())) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1623691&r1=1623690&r2=1623691&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Sep 9 08:40:56 2014
@@ -116,6 +116,11 @@
<scode>
Refactor to reduce code duplication identified by Simian. (markt)
</scode>
+ <fix>
+ When using parallel deployment, correctly undeploy context of old
+ version. Make sure that never undeploy older Context If current context
+ is not running. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org