Author: kfujino
Date: Tue Sep 9 08:42:33 2014
New Revision: 1623692
URL: http://svn.apache.org/r1623692
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/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1623692&r1=1623691&r2=1623692&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Tue
Sep 9 08:42:33 2014
@@ -1695,7 +1695,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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1623692&r1=1623691&r2=1623692&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Sep 9 08:42:33 2014
@@ -145,6 +145,11 @@
Fix some potential resource leaks when reading properties, files and
other resources. Reported by Coverity Scan. (violetagg)
</fix>
+ <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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
