Author: kfujino
Date: Mon Apr 18 07:57:45 2016
New Revision: 1739702
URL: http://svn.apache.org/viewvc?rev=1739702&view=rev
Log:
Add get/set method for the channel that is related to each Channel services.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1739702&r1=1739701&r2=1739702&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Mon Apr 18 07:57:45 2016
@@ -27,6 +27,7 @@ import org.apache.catalina.tribes.Messag
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.ReceiverBase;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.tribes.transport.nio.NioReceiver;
@@ -159,10 +160,16 @@ public class ChannelCoordinator extends
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());
+ }
valid = true;
}
@@ -172,10 +179,16 @@ public class ChannelCoordinator extends
((McastService)membershipService).setMessageListener(this);
}
membershipService.start(MembershipService.MBR_RX);
+ if (membershipService instanceof McastService) {
+ ((McastService)membershipService).setChannel(getChannel());
+ }
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());
+ }
valid = true;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1739702&r1=1739701&r2=1739702&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Mon Apr 18 07:57:45 2016
@@ -84,6 +84,8 @@ public class McastService implements Mem
protected byte[] domain;
+ private Channel channel;
+
/**
* Create a membership service.
*/
@@ -441,7 +443,7 @@ public class McastService implements Mem
impl.setRecoveryCounter(recCnt);
long recSlpTime =
Long.parseLong(properties.getProperty("recoverySleepTime","5000"));
impl.setRecoverySleepTime(recSlpTime);
-
+ impl.setChannel(channel);
impl.start(level);
@@ -678,6 +680,14 @@ public class McastService implements Mem
else setDomain(Arrays.convert(domain));
}
+ public Channel getChannel() {
+ return channel;
+ }
+
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
/**
* Simple test program
* @param args Command-line arguments
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1739702&r1=1739701&r2=1739702&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Mon Apr 18 07:57:45 2016
@@ -149,6 +149,8 @@ public class McastServiceImpl
* disable/enable local loopback message
*/
protected boolean localLoopbackDisabled = false;
+
+ private Channel channel;
/**
* Create a new mcast service impl
@@ -520,6 +522,14 @@ public class McastServiceImpl
return recoverySleepTime;
}
+ public Channel getChannel() {
+ return channel;
+ }
+
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
public class ReceiverThread extends Thread {
int errorCounter = 0;
public ReceiverThread() {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=1739702&r1=1739701&r2=1739702&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Mon Apr 18 07:57:45 2016
@@ -26,6 +26,7 @@ import java.util.concurrent.ThreadFactor
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelReceiver;
import org.apache.catalina.tribes.MessageListener;
@@ -86,6 +87,7 @@ public abstract class ReceiverBase imple
private long maxIdleTime = 60000;
private ExecutorService executor;
+ private Channel channel;
public ReceiverBase() {
@@ -569,6 +571,14 @@ public abstract class ReceiverBase imple
this.udpTxBufSize = udpTxBufSize;
}
+ public Channel getChannel() {
+ return channel;
+ }
+
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
// ---------------------------------------------- ThreadFactory Inner Class
class TaskThreadFactory implements ThreadFactory {
final ThreadGroup group;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=1739702&r1=1739701&r2=1739702&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
Mon Apr 18 07:57:45 2016
@@ -17,6 +17,7 @@
package org.apache.catalina.tribes.transport;
+import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelSender;
@@ -33,6 +34,8 @@ import org.apache.catalina.tribes.util.S
*/
public class ReplicationTransmitter implements ChannelSender {
+ private Channel channel;
+
/**
* The descriptive information about this implementation.
*/
@@ -130,6 +133,14 @@ public class ReplicationTransmitter impl
getTransport().remove(member);
}
+ public Channel getChannel() {
+ return channel;
+ }
+
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
// ------------------------------------------------------------- protected
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1739702&r1=1739701&r2=1739702&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Apr 18 07:57:45 2016
@@ -104,6 +104,10 @@
environment, the local member inherits properties from the cluster
receiver. (kfujino)
</fix>
+ <add>
+ Add get/set method for the channel that is related to each Channel
+ services. (kfujino)
+ </add>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
