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

Managers will be restarted on Context reload

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

diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java
index c21c853..f9ff387 100644 (file)
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -253,8 +253,6 @@ public class BackupManager extends StandardManager implements ClusterManager, Ma
 
         cluster.removeManager(this);
         this.random = null;
-
-        setState(LifecycleState.MUST_DESTROY);
     }
 
     @Override

diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 1c61021..9216120 100644 (file)
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -987,8 +987,6 @@ public class DeltaManager extends ClusterManagerBase{
         this.random = null;
         getCluster().removeManager(this);
         replicationValve = null;
-        
-        setState(LifecycleState.MUST_DESTROY);
     }
 
     // ----------------------------------------- PropertyChangeListener Methods

diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java
index 03dd77b..259ace6 100644 (file)
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -958,9 +958,6 @@ public abstract class PersistentManagerBase extends ManagerBase
 
         // Require a new random number generator if we are restarted
         this.random = null;
-
-        setState(LifecycleState.MUST_DESTROY);
-
     }