You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2004/10/20 00:30:50 UTC
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp SimpleTcpCluster.java
fhanik 2004/10/19 15:30:50
Modified: modules/cluster/src/share/org/apache/catalina/cluster
CatalinaCluster.java
modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
Log:
Made the cluster survice reloads
Revision Changes Path
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CatalinaCluster.java 23 Jun 2004 13:51:37 -0000 1.7
+++ CatalinaCluster.java 19 Oct 2004 22:30:50 -0000 1.8
@@ -107,5 +107,6 @@
public Manager getManager(String name);
public void removeManager(String name);
+ public void addManager(String name, ClusterManager manager);
}
1.33 +6 -3 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DeltaManager.java 19 Oct 2004 21:38:55 -0000 1.32
+++ DeltaManager.java 19 Oct 2004 22:30:50 -0000 1.33
@@ -625,6 +625,9 @@
log.error("Starting... no cluster associated with this context:"+getName());
return;
}
+ //to survice context reloads, as only a stop/start is called, not createManager
+ System.out.println("\n\n\nADDING MANAGER WITH NAME "+getName()+"\n\n\n");
+ getCluster().addManager(getName(),this);
if (cluster.getMembers().length > 0) {
Member mbr = cluster.getMembers()[0];
@@ -668,7 +671,6 @@
} catch (Throwable t) {
log.error(sm.getString("standardManager.managerLoad"), t);
}
-
}
@@ -685,6 +687,8 @@
if (log.isDebugEnabled())
log.debug("Stopping");
+ getCluster().removeManager(getName());
+
// Validate and update our current component state
if (!started)
throw new LifecycleException
@@ -715,7 +719,6 @@
if( initialized ) {
destroy();
}
- getCluster().removeManager(getName());
}
1.52 +10 -8 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SimpleTcpCluster.java 5 Oct 2004 17:12:50 -0000 1.51
+++ SimpleTcpCluster.java 19 Oct 2004 22:30:50 -0000 1.52
@@ -284,6 +284,15 @@
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 removeManager(String name) {
+ managers.remove(name);
+ }
+
+ public void addManager(String name, ClusterManager manager) {
manager.setName(name);
manager.setCluster(this);
manager.setDistributable(true);
@@ -291,13 +300,6 @@
manager.setUseDirtyFlag(useDirtyFlag);
manager.setNotifyListenersOnReplication(notifyListenersOnReplication);
managers.put(name,manager);
-
-
- return manager;
- }
-
- public void removeManager(String name) {
- managers.remove(name);
}
public Manager getManager(String name) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org