svn commit: r1739715 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

[kfujino]

Author: kfujino
Date: Mon Apr 18 09:22:31 2016
New Revision: 1739715

URL: http://svn.apache.org/viewvc?rev=1739715&view=rev
Log:
Set the channel instance before starting channel services.

Modified:
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739715&r1=1739714&r2=1739715&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
 Mon Apr 18 09:22:31 2016
@@ -153,6 +153,9 @@ public class ChannelCoordinator extends
             //listens to with the local membership settings
             if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
                 clusterReceiver.setMessageListener(this);
+                if (clusterReceiver instanceof ReceiverBase) {
+                    ((ReceiverBase)clusterReceiver).setChannel(getChannel());
+                }
                 clusterReceiver.start();
                 //synchronize, big time FIXME
                 Member localMember = getChannel().getLocalMember(false);
@@ -169,16 +172,13 @@ public class ChannelCoordinator extends
                             getClusterReceiver().getSecurePort(),
                             getClusterReceiver().getUdpPort());
                 }
-                if (clusterReceiver instanceof ReceiverBase) {
-                    ((ReceiverBase)clusterReceiver).setChannel(getChannel());
-                }
                 valid = true;
             }
             if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
-                clusterSender.start();
                 if (clusterSender instanceof ReplicationTransmitter) {
                     
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
                 }
+                clusterSender.start();
                 valid = true;
             }
 
@@ -186,18 +186,16 @@ public class ChannelCoordinator extends
                 membershipService.setMembershipListener(this);
                 if (membershipService instanceof McastService) {
                     ((McastService)membershipService).setMessageListener(this);
-                }
-                membershipService.start(MembershipService.MBR_RX);
-                if (membershipService instanceof McastService) {
                     ((McastService)membershipService).setChannel(getChannel());
                 }
+                membershipService.start(MembershipService.MBR_RX);
                 valid = true;
             }
             if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
-                membershipService.start(MembershipService.MBR_TX);
                 if (membershipService instanceof McastService) {
                     ((McastService)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