Author: kfujino
Date: Mon Apr 18 09:21:54 2016
New Revision: 1739714
URL: http://svn.apache.org/viewvc?rev=1739714&view=rev
Log:
Set the channel instance before starting channel services.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739714&r1=1739713&r2=1739714&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Mon Apr 18 09:21:54 2016
@@ -151,6 +151,7 @@ public class ChannelCoordinator extends
//listens to with the local membership settings
if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
clusterReceiver.setMessageListener(this);
+ clusterReceiver.setChannel(getChannel());
clusterReceiver.start();
//synchronize, big time FIXME
Member localMember = getChannel().getLocalMember(false);
@@ -167,27 +168,26 @@ public class ChannelCoordinator extends
getClusterReceiver().getSecurePort(),
getClusterReceiver().getUdpPort());
}
- clusterReceiver.setChannel(getChannel());
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
- clusterSender.start();
clusterSender.setChannel(getChannel());
+ clusterSender.start();
valid = true;
}
if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
membershipService.setMembershipListener(this);
+ membershipService.setChannel(getChannel());
if (membershipService instanceof McastService) {
((McastService)membershipService).setMessageListener(this);
}
membershipService.start(MembershipService.MBR_RX);
- membershipService.setChannel(getChannel());
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
- membershipService.start(MembershipService.MBR_TX);
membershipService.setChannel(getChannel());
+ membershipService.start(MembershipService.MBR_TX);
valid = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
