Author: kfujino
Date: Mon Apr 18 07:51:23 2016
New Revision: 1739700
URL: http://svn.apache.org/viewvc?rev=1739700&view=rev
Log:
Add get/set method for the channel that is related to each Channel services.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelReceiver.java
Mon Apr 18 07:51:23 2016
@@ -78,4 +78,16 @@ public interface ChannelReceiver extends
*/
public MessageListener getMessageListener();
+ /**
+ * Return the channel that is related to this ChannelReceiver
+ * @return Channel
+ */
+ public Channel getChannel();
+
+ /**
+ * Set the channel that is related to this ChannelReceiver
+ * @param channel The channel
+ */
+ public void setChannel(Channel channel);
+
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/ChannelSender.java Mon
Apr 18 07:51:23 2016
@@ -68,4 +68,17 @@ public interface ChannelSender extends H
* @see ChannelException#addFaultyMember(Member,java.lang.Exception)
*/
public void sendMessage(ChannelMessage message, Member[] destination)
throws ChannelException;
+
+ /**
+ * Return the channel that is related to this ChannelSender
+ * @return Channel
+ */
+ public Channel getChannel();
+
+ /**
+ * Set the channel that is related to this ChannelSender
+ * @param channel The channel
+ */
+ public void setChannel(Channel channel);
+
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/MembershipService.java
Mon Apr 18 07:51:23 2016
@@ -144,4 +144,16 @@ public interface MembershipService {
*/
public void broadcast(ChannelMessage message) throws ChannelException;
+ /**
+ * Return the channel that is related to this MembershipService
+ * @return Channel
+ */
+ public Channel getChannel();
+
+ /**
+ * Set the channel that is related to this MembershipService
+ * @param channel The channel
+ */
+ public void setChannel(Channel channel);
+
}
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=1739700&r1=1739699&r2=1739700&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 07:51:23 2016
@@ -167,10 +167,12 @@ 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());
valid = true;
}
@@ -180,10 +182,12 @@ public class ChannelCoordinator extends
((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());
valid = true;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Mon Apr 18 07:51:23 2016
@@ -78,6 +78,8 @@ public class McastService implements Mem
protected byte[] domain;
+ private Channel channel;
+
/**
* Create a membership service.
*/
@@ -358,7 +360,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);
@@ -565,6 +567,16 @@ public class McastService implements Mem
else setDomain(Arrays.convert(domain));
}
+ @Override
+ public Channel getChannel() {
+ return channel;
+ }
+
+ @Override
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
/**
* Simple test program
* @param args Command-line arguments
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Mon Apr 18 07:51:23 2016
@@ -155,6 +155,8 @@ public class McastServiceImpl {
*/
protected final boolean localLoopbackDisabled;
+ private Channel channel;
+
/**
* Create a new mcast service instance.
* @param member - the local member
@@ -531,6 +533,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/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Mon Apr 18 07:51:23 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;
@@ -79,7 +80,7 @@ public abstract class ReceiverBase imple
private long maxIdleTime = 60000;
private ExecutorService executor;
-
+ private Channel channel;
public ReceiverBase() {
}
@@ -489,6 +490,16 @@ public abstract class ReceiverBase imple
this.udpTxBufSize = udpTxBufSize;
}
+ @Override
+ public Channel getChannel() {
+ return channel;
+ }
+
+ @Override
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
// ---------------------------------------------- ThreadFactory Inner Class
class TaskThreadFactory implements ThreadFactory {
final ThreadGroup group;
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
Mon Apr 18 07:51:23 2016
@@ -16,6 +16,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;
@@ -29,6 +30,8 @@ import org.apache.catalina.tribes.transp
*/
public class ReplicationTransmitter implements ChannelSender {
+ private Channel channel;
+
public ReplicationTransmitter() {
}
@@ -105,4 +108,15 @@ public class ReplicationTransmitter impl
public synchronized void remove(Member member) {
getTransport().remove(member);
}
+
+ @Override
+ public Channel getChannel() {
+ return channel;
+ }
+
+ @Override
+ public void setChannel(Channel channel) {
+ this.channel = channel;
+ }
+
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1739700&r1=1739699&r2=1739700&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Apr 18 07:51:23 2016
@@ -255,6 +255,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
