fhanik 2004/10/20 10:02:17
Modified: modules/cluster/src/share/org/apache/catalina/cluster Tag:
TOMCAT_5_0 CatalinaCluster.java
modules/cluster/src/share/org/apache/catalina/cluster/session
Tag: TOMCAT_5_0 DeltaManager.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
Tag: TOMCAT_5_0 SimpleTcpCluster.java
Log:
Fixed defect 31495,
the cluster manager should survive the context reload by readding itself to the
cluster upon start.
Revision Changes Path
No revision
No revision
1.6.2.1 +2 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java
Index: CatalinaCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- CatalinaCluster.java 4 Jun 2004 20:22:27 -0000 1.6
+++ CatalinaCluster.java 20 Oct 2004 17:02:16 -0000 1.6.2.1
@@ -109,5 +109,6 @@
public Manager getManager(String name);
public void removeManager(String name);
+ public void addManager(String name, ClusterManager manager);
}
No revision
No revision
1.27.2.2 +5 -2
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Index: DeltaManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- DeltaManager.java 19 Oct 2004 21:59:05 -0000 1.27.2.1
+++ DeltaManager.java 20 Oct 2004 17:02:16 -0000 1.27.2.2
@@ -613,6 +613,7 @@
if (started) {
return;
}
+ getCluster().addManager(getName(),this);
started = true;
lifecycle.fireLifecycleEvent(START_EVENT, null);
@@ -688,12 +689,14 @@
if (log.isDebugEnabled())
log.debug("Stopping");
+ getCluster().removeManager(getName());
// Validate and update our current component state
if (!started)
throw new LifecycleException
(sm.getString("standardManager.notStarted"));
lifecycle.fireLifecycleEvent(STOP_EVENT, null);
started = false;
+
// Expire all active sessions
{
@@ -718,7 +721,7 @@
if( initialized ) {
destroy();
}
- getCluster().removeManager(getName());
+
}
No revision
No revision
1.41.2.1 +7 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Index: SimpleTcpCluster.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -u -r1.41 -r1.41.2.1
--- SimpleTcpCluster.java 4 Jun 2004 20:22:27 -0000 1.41
+++ SimpleTcpCluster.java 20 Oct 2004 17:02:16 -0000 1.41.2.1
@@ -325,14 +325,18 @@
log.error("Unable to load class for replication manager",x);
manager = new
org.apache.catalina.cluster.session.SimpleTcpReplicationManager();
}
+ addManager(name,manager);
+
+ return manager;
+ }
+
+ public void addManager(String name, ClusterManager manager) {
manager.setName(name);
manager.setCluster(this);
manager.setDistributable(true);
manager.setExpireSessionsOnShutdown(expireSessionsOnShutdown);
manager.setUseDirtyFlag(useDirtyFlag);
managers.put(name,manager);
-
- return manager;
}
public void removeManager(String name) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
