From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 31 May 2010 16:57:45 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49360
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c524f25ff967b441c4e5bd4d734faefd4a2b9214;p=tomcat7.0

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 c21c8538f..f9ff387ca 100644
--- 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 1c61021a0..9216120ac 100644
--- 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 03dd77bf8..259ace6d2 100644
--- 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);
-
     }