pero 2005/04/29 13:11:26
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaManager.java
Log:
fIX that application can start/stop and start again.
Revision Changes Path
1.46 +20 -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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- DeltaManager.java 22 Apr 2005 20:33:45 -0000 1.45
+++ DeltaManager.java 29 Apr 2005 20:11:26 -0000 1.46
@@ -29,8 +29,10 @@
import java.util.Date;
import java.util.Iterator;
+import org.apache.catalina.Cluster;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
+import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
@@ -896,6 +898,22 @@
// Load unloaded sessions, if any
try {
//the channel is already running
+ Cluster cluster = getCluster() ;
+ // stop remove cluster binding
+ if(cluster == null) {
+ Container context = getContainer() ;
+ if(context != null && context instanceof Context) {
+ Container host = context.getParent() ;
+ if(host != null && host instanceof Host) {
+ cluster = host.getCluster();
+ if(cluster != null && cluster instanceof
CatalinaCluster) {
+ setCluster((CatalinaCluster) cluster) ;
+ } else {
+ cluster = null ;
+ }
+ }
+ }
+ }
if (cluster == null) {
log.error(sm.getString("deltaManager.noCluster", getName()));
return;
@@ -905,7 +923,7 @@
.getString("deltaManager.startClustering",
getName()));
//to survice context reloads, as only a stop/start is called, not
// createManager
- getCluster().addManager(getName(), this);
+ ((CatalinaCluster)cluster).addManager(getName(), this);
getAllClusterSessions();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
