From c14447c783d858d6e698172c6490eb524bc59169 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 9 Nov 2010 16:59:24 +0000 Subject: [PATCH] Fix warnings git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1033097 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/tribes/group/RpcChannel.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java index 0fb774bd1..37b650a37 100644 --- a/java/org/apache/catalina/tribes/group/RpcChannel.java +++ b/java/org/apache/catalina/tribes/group/RpcChannel.java @@ -81,7 +81,8 @@ public class RpcChannel implements ChannelListener{ if ( destination==null || destination.length == 0 ) return new Response[0]; //avoid dead lock - channelOptions = channelOptions & ~Channel.SEND_OPTIONS_SYNCHRONIZED_ACK; + int sendOptions = + channelOptions & ~Channel.SEND_OPTIONS_SYNCHRONIZED_ACK; RpcCollectorKey key = new RpcCollectorKey(UUIDGenerator.randomUUID(false)); RpcCollector collector = new RpcCollector(key,rpcOptions,destination.length,timeout); @@ -89,7 +90,7 @@ public class RpcChannel implements ChannelListener{ synchronized (collector) { if ( rpcOptions != NO_REPLY ) responseMap.put(key, collector); RpcMessage rmsg = new RpcMessage(rpcId, key.id, message); - channel.send(destination, rmsg, channelOptions); + channel.send(destination, rmsg, sendOptions); if ( rpcOptions != NO_REPLY ) collector.wait(timeout); } } catch ( InterruptedException ix ) { @@ -101,6 +102,7 @@ public class RpcChannel implements ChannelListener{ return collector.getResponses(); } + @Override public void messageReceived(Serializable msg, Member sender) { RpcMessage rmsg = (RpcMessage)msg; RpcCollectorKey key = new RpcCollectorKey(rmsg.uuid); @@ -144,6 +146,7 @@ public class RpcChannel implements ChannelListener{ breakdown(); } + @Override public boolean accept(Serializable msg, Member sender) { if ( msg instanceof RpcMessage ) { RpcMessage rmsg = (RpcMessage)msg; -- 2.11.0