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 2006/06/15 16:11:30 UTC
svn commit: r414590 - in /tomcat/container/tc5.5.x/modules/groupcom: VERSION
src/share/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Author: fhanik
Date: Thu Jun 15 07:11:29 2006
New Revision: 414590
URL: http://svn.apache.org/viewvc?rev=414590&view=rev
Log:
Final bug fixes, coordinator is now working as expected
Modified:
tomcat/container/tc5.5.x/modules/groupcom/VERSION
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Modified: tomcat/container/tc5.5.x/modules/groupcom/VERSION
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/VERSION?rev=414590&r1=414589&r2=414590&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/VERSION (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/VERSION Thu Jun 15 07:11:29 2006
@@ -1,5 +1,5 @@
-0.9.2.7
- - finished coordinator
+0.9.2.8
+ - finished coordinator and bug fixes in the coordinator and ChannelReceiver
0.9.2.6
- first version of the NonBlockingCoordinator implemented
- org.apache.catalina.tribes.demos.CoordinationDemo implemented
Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=414590&r1=414589&r2=414590&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java Thu Jun 15 07:11:29 2006
@@ -315,12 +315,15 @@
}
protected void processCoordMessage(CoordinationMessage msg, Member sender) throws ChannelException {
+ if ( !coordMsgReceived.get() ) {
coordMsgReceived.set(true);
- msg.timestamp = System.currentTimeMillis();
- Membership merged = mergeOnArrive(msg,sender);
- if ( isViewConf(msg) ) handleViewConf(msg, sender,merged);
- else handleToken(msg, sender, merged);
-// }
+ synchronized (electionMutex) { electionMutex.notifyAll();}
+ }
+ msg.timestamp = System.currentTimeMillis();
+ Membership merged = mergeOnArrive(msg, sender);
+ if (isViewConf(msg)) handleViewConf(msg, sender, merged);
+ else handleToken(msg, sender, merged);
+
}
protected void handleToken(CoordinationMessage msg, Member sender,Membership merged) throws ChannelException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org