tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r408826 - /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Date Tue, 23 May 2006 03:53:53 GMT
Author: fhanik
Date: Mon May 22 20:53:53 2006
New Revision: 408826

URL: http://svn.apache.org/viewvc?rev=408826&view=rev
Log:
more coding

Modified:
    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/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=408826&r1=408825&r2=408826&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
Mon May 22 20:53:53 2006
@@ -134,7 +134,7 @@
     
     protected UniqueId viewId;
     protected UniqueId suggestedviewId;
-
+    
     protected boolean started = false;
     protected final int startsvc = 0xFFFF;
     
@@ -219,13 +219,21 @@
                     Member[] suggested = suggestedview.getMembers();
                     Member[] received = msg.getMembers();
                     if (Arrays.sameMembers(suggested,received) ) {
-                        //did the view change
+                        //we completed the loop
+                        view = suggestedview;
+                        viewId = suggestedviewId;
                         suggestedviewId = null;
                         suggestedview.reset();
-                        viewChange(msg.getId(),received);
+                        viewChange(viewId,view.getMembers());
+                        release();
                     } else  {  
                         //view or leadership changed
-                        
+                        if ( !local.equals(msg.getLeader()) ) {
+                            //leadership changed
+                        } else {
+                            //leadership didn't change
+                            //circulate it again
+                        }
                     }
                 }
             } else {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message