Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49957

Correct regression due to Lifecycle re-factoring that cleared all work directories (with compiled JSPs and persisted sessions) when Tomcat was stopped.

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

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index ec82b5d..0a986a4 100644 (file)
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1332,8 +1332,6 @@ public class HostConfig
         if (log.isDebugEnabled())
             log.debug(sm.getString("hostConfig.stop"));
 
-        undeployApps();
-
         if (oname != null) {
             try {
                 Registry.getRegistry(null, null).unregisterComponent(oname);
@@ -1349,32 +1347,6 @@ public class HostConfig
 
 
     /**
-     * Undeploy all deployed applications.
-     */
-    protected void undeployApps() {
-
-        if (log.isDebugEnabled())
-            log.debug(sm.getString("hostConfig.undeploying"));
-
-        // Soft undeploy all contexts we have deployed
-        DeployedApplication[] apps =
-            deployed.values().toArray(new DeployedApplication[0]);
-        for (int i = 0; i < apps.length; i++) {
-            try {
-                host.removeChild(host.findChild(apps[i].name));
-            } catch (Throwable t) {
-                ExceptionUtils.handleThrowable(t);
-                log.warn(sm.getString
-                        ("hostConfig.context.remove", apps[i].name), t);
-            }
-        }
-        
-        deployed.clear();
-
-    }
-
-
-    /**
      * Check status of all webapps.
      */
     protected void check() {

diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index b236ca8..695cc7e 100644 (file)
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -99,7 +99,6 @@ hostConfig.start=HostConfig: Processing START
 hostConfig.stop=HostConfig: Processing STOP
 hostConfig.undeploy=Undeploying context [{0}]
 hostConfig.undeploy.error=Error undeploying web application at context path {0}
-hostConfig.undeploying=Undeploying deployed web applications
 tldConfig.addListeners=Adding {0} listeners from TLD files
 tldConfig.cce=Lifecycle event data object {0} is not a Context
 tldConfig.dirFail=Failed to process directory [{0}] for TLD files

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 435155b..4b0b2cd 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,11 @@
         <bug>49956</bug>: Handle case when @Resource annotation uses the full
         JNDI name for a resource. Based on a patch by Gurkan Erdogdu. (markt) 
       </fix>
+      <fix>
+        <bug>49557</bug>: Correct regression due to Lifecycle refactoring that
+        cleared all work directories (with compiled JSPs and persisted sessions)
+        when Tomcat was stopped. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">