fhanik 2003/03/14 16:20:56
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
SimpleTcpReplicationManager.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
Log:
okey dokey, let the managers notify the cluster when they are ready to receive data
from other nodes, instead of waiting for an event from the server
Revision Changes Path
1.3 +20 -12
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Index: SimpleTcpReplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleTcpReplicationManager.java 20 Feb 2003 17:54:15 -0000 1.2
+++ SimpleTcpReplicationManager.java 15 Mar 2003 00:20:56 -0000 1.3
@@ -387,6 +387,10 @@
}
return null;
}
+
+ public String getName() {
+ return this.name;
+ }
/**
* Prepare for the beginning of active use of the public methods of this
* component. This method should be called after <code>configure()</code>,
@@ -398,21 +402,25 @@
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
- public void start() throws LifecycleException
- {
+ public void start() throws LifecycleException {
mManagerRunning = true;
super.start();
//start the javagroups channel
- try
- {
+ try {
//the channel is already running
if ( mChannelStarted ) return;
+ if (cluster.getMembers().length > 0) {
+ SessionMessage msg =
+ new SessionMessage(this.getName(),
+ SessionMessage.EVT_GET_ALL_SESSIONS,
+ null,
+ null);
+ cluster.send(msg, cluster.getMembers()[0]);
+ }//end if
+ mChannelStarted = true;
+ } catch ( Exception x ) {
+ log("Unable to start SimpleTcpReplicationManager",x,1);
}
- catch ( Exception x )
- {
- log("Unable to start javagroups channel",x,1);
- }
-
}
/**
1.6 +26 -21
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleTcpCluster.java 5 Mar 2003 23:54:47 -0000 1.5
+++ SimpleTcpCluster.java 15 Mar 2003 00:20:56 -0000 1.6
@@ -272,10 +272,10 @@
log.error("In SimpleTcpCluster.constructor()",x);
}
- if ( ServerFactory.getServer() instanceof StandardServer ) {
- StandardServer server = (StandardServer) ServerFactory.getServer();
- server.addLifecycleListener(this);
- }
+// if ( ServerFactory.getServer() instanceof StandardServer ) {
+// StandardServer server = (StandardServer) ServerFactory.getServer();
+// server.addLifecycleListener(this);
+// }
}
/**
@@ -381,6 +381,11 @@
return (this.protocol);
}
+ public Member[] getMembers() {
+ return service.getMembers();
+ }
+
+
// --------------------------------------------------------- Public Methods
@@ -650,19 +655,19 @@
}
public void lifecycleEvent(LifecycleEvent lifecycleEvent){
- if (
lifecycleEvent.getLifecycle().AFTER_START_EVENT.equals(lifecycleEvent.getType()) ) {
- //The server has started
- SessionMessage msg =
- new SessionMessage(null,
- SessionMessage.EVT_GET_ALL_SESSIONS,
- null,
- null);
- if (service.getMembers().length > 0) {
- Member mbr = service.getMembers()[0];
- send(msg, mbr);
- }
-
- }//end if
+// if (
lifecycleEvent.getLifecycle().AFTER_START_EVENT.equals(lifecycleEvent.getType()) ) {
+// //The server has started
+// SessionMessage msg =
+// new SessionMessage(null,
+// SessionMessage.EVT_GET_ALL_SESSIONS,
+// null,
+// null);
+// if (service.getMembers().length > 0) {
+// Member mbr = service.getMembers()[0];
+// send(msg, mbr);
+// }
+//
+// }//end if
}
// --------------------------------------------- Inner Class
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
