Author: kkolinko Date: Mon Aug 29 12:45:42 2011 New Revision: 1162769 URL: http://svn.apache.org/viewvc?rev=1162769&view=rev Log: Followup to r1162721 Get list of members only once Improve message and code formatting
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1162769&r1=1162768&r2=1162769&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Mon Aug 29 12:45:42 2011 @@ -305,20 +305,22 @@ public abstract class AbstractReplicated * @throws ChannelException */ protected void broadcast(int msgtype, boolean rpc) throws ChannelException { + Member[] members = channel.getMembers(); // No destination. - if (channel.getMembers().length == 0 ) return; + if (members.length == 0 ) return; //send out a map membership message, only wait for the first reply MapMessage msg = new MapMessage(this.mapContextName, msgtype, false, null, null, null, channel.getLocalMember(false), null); if ( rpc) { - Response[] resp = rpcChannel.send(channel.getMembers(), msg, RpcChannel.FIRST_REPLY, (channelSendOptions),rpcTimeout); + Response[] resp = rpcChannel.send(members, msg, + RpcChannel.FIRST_REPLY, (channelSendOptions), rpcTimeout); if (resp.length > 0) { for (int i = 0; i < resp.length; i++) { mapMemberAdded(resp[i].getSource()); messageReceived(resp[i].getMessage(), resp[i].getSource()); } } else { - log.warn("broadcast 0 replies, probably a timeout."); + log.warn("broadcast received 0 replies, probably a timeout."); } } else { channel.send(channel.getMembers(),msg,channelSendOptions); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org