tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1177999 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Date Sat, 01 Oct 2011 14:49:07 GMT
Author: markt
Date: Sat Oct  1 14:49:07 2011
New Revision: 1177999

URL: http://svn.apache.org/viewvc?rev=1177999&view=rev
Log:
Remove unused parameter

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1177999&r1=1177998&r2=1177999&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Sat Oct  1 14:49:07 2011
@@ -296,7 +296,7 @@ public class NonBlockingCoordinator exte
                                               getOptionFlag());
     }
     
-    protected Membership mergeOnArrive(CoordinationMessage msg, Member sender) {
+    protected Membership mergeOnArrive(CoordinationMessage msg) {
         fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_PRE_MERGE,this,"Pre
merge"));
         MemberImpl local = (MemberImpl)getLocalMember(false);
         Membership merged = new Membership(local,AbsoluteOrder.comp,true);
@@ -317,7 +317,7 @@ public class NonBlockingCoordinator exte
             synchronized (electionMutex) { electionMutex.notifyAll();}
         } 
         msg.timestamp = System.currentTimeMillis();
-        Membership merged = mergeOnArrive(msg, sender);
+        Membership merged = mergeOnArrive(msg);
         if (isViewConf(msg)) handleViewConf(msg, sender, merged);
         else handleToken(msg, sender, merged);
     }



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


Mime
View raw message