From 737561deeb179809cbe1bf2e0e80cdfd0adeefe7 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 1 Oct 2011 14:49:07 +0000 Subject: [PATCH] Remove unused parameter git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1177999 13f79535-47bb-0310-9956-ffa450edef68 --- .../catalina/tribes/group/interceptors/NonBlockingCoordinator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java index 6ae0220ea..7c6e8a828 100644 --- a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java +++ b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java @@ -296,7 +296,7 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase { 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 extends ChannelInterceptorBase { 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); } -- 2.11.0