Author: kfujino
Date: Tue Apr 12 07:50:28 2016
New Revision: 1738721
URL: http://svn.apache.org/viewvc?rev=1738721&view=rev
Log:
As with the multicast cluster environment, in the static cluster environment,
the local member inherits properties from the cluster receiver.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1738721&r1=1738720&r2=1738721&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Tue Apr 12 07:50:28 2016
@@ -26,6 +26,7 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.MessageListener;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.membership.McastService;
+import org.apache.catalina.tribes.membership.StaticMember;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -152,10 +153,21 @@ public class ChannelCoordinator extends
clusterReceiver.setMessageListener(this);
clusterReceiver.start();
//synchronize, big time FIXME
-
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
-
getClusterReceiver().getPort(),
-
getClusterReceiver().getSecurePort(),
-
getClusterReceiver().getUdpPort());
+ Member localMember = getChannel().getLocalMember(false);
+ if (localMember instanceof StaticMember) {
+ // static member
+ StaticMember staticMember = (StaticMember)localMember;
+ staticMember.setHost(getClusterReceiver().getHost());
+ staticMember.setPort(getClusterReceiver().getPort());
+
staticMember.setSecurePort(getClusterReceiver().getSecurePort());
+ } else {
+ // multicast member
+
membershipService.setLocalMemberProperties(getClusterReceiver().getHost(),
+ getClusterReceiver().getPort(),
+ getClusterReceiver().getSecurePort(),
+ getClusterReceiver().getUdpPort());
+
+ }
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1738721&r1=1738720&r2=1738721&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 12 07:50:28 2016
@@ -218,6 +218,11 @@
Add get/set method for the channel that is related to
<code>ChannelInterceptor</code>. (kfujino)
</add>
+ <fix>
+ As with the multicast cluster environment, in the static cluster
+ environment, the local member inherits properties from the cluster
+ receiver. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
