Author: kfujino
Date: Thu Apr 21 07:09:45 2016
New Revision: 1740242
URL: http://svn.apache.org/viewvc?rev=1740242&view=rev
Log:
Revert r1740044.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
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=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Thu Apr 21 07:09:45 2016
@@ -151,10 +151,10 @@ 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(channel);
+ clusterReceiver.setChannel(getChannel());
clusterReceiver.start();
//synchronize, big time FIXME
- Member localMember = channel.getLocalMember(false);
+ Member localMember = getChannel().getLocalMember(false);
if (localMember instanceof StaticMember) {
// static member
StaticMember staticMember = (StaticMember)localMember;
@@ -171,14 +171,14 @@ public class ChannelCoordinator extends
valid = true;
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
- clusterSender.setChannel(channel);
+ clusterSender.setChannel(getChannel());
clusterSender.start();
valid = true;
}
if ( Channel.MBR_RX_SEQ==(svc & Channel.MBR_RX_SEQ) ) {
membershipService.setMembershipListener(this);
- membershipService.setChannel(channel);
+ membershipService.setChannel(getChannel());
if (membershipService instanceof McastService) {
((McastService)membershipService).setMessageListener(this);
}
@@ -186,7 +186,7 @@ public class ChannelCoordinator extends
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
- membershipService.setChannel(channel);
+ membershipService.setChannel(getChannel());
membershipService.start(MembershipService.MBR_TX);
valid = true;
}
@@ -247,7 +247,7 @@ public class ChannelCoordinator extends
}
startLevel = (startLevel & (~svc));
- channel = null;
+ setChannel(null);
} catch (Exception x) {
throw new ChannelException(x);
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Thu Apr 21 07:09:45 2016
@@ -29,7 +29,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
- protected Channel channel;
+ private Channel channel;
//default value, always process
protected int optionFlag = 0;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Thu Apr 21 07:09:45 2016
@@ -111,7 +111,7 @@ public class MessageDispatchInterceptor
return;
}
String channelName = "";
- if (channel.getName() != null) channelName = "[" + channel.getName() +
"]";
+ if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads,
keepAliveTime,
TimeUnit.MILLISECONDS,
new
TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread" +
channelName));
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Thu Apr 21 07:09:45 2016
@@ -70,7 +70,7 @@ public class TcpPingInterceptor extends
thread = new PingThread();
thread.setDaemon(true);
String channelName = "";
- if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+ if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
thread.setName("TcpPingInterceptor.PingThread" + channelName
+"-"+cnt.addAndGet(1));
thread.start();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Thu Apr 21 07:09:45 2016
@@ -78,7 +78,7 @@ public class McastService implements Mem
protected byte[] domain;
- protected Channel channel;
+ private Channel channel;
/**
* Create a membership service.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Thu Apr 21 07:09:45 2016
@@ -155,7 +155,7 @@ public class McastServiceImpl {
*/
protected final boolean localLoopbackDisabled;
- protected Channel channel;
+ private Channel channel;
/**
* Create a new mcast service instance.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Thu Apr 21 07:09:45 2016
@@ -80,7 +80,7 @@ public abstract class ReceiverBase imple
private long maxIdleTime = 60000;
private ExecutorService executor;
- protected Channel channel;
+ private Channel channel;
public ReceiverBase() {
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
Thu Apr 21 07:09:45 2016
@@ -30,7 +30,7 @@ import org.apache.catalina.tribes.transp
*/
public class ReplicationTransmitter implements ChannelSender {
- protected Channel channel;
+ private Channel channel;
public ReplicationTransmitter() {
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Thu Apr 21 07:09:45 2016
@@ -54,7 +54,7 @@ public class BioReceiver extends Receive
getBind();
bind();
String channelName = "";
- if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+ if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
Thread t = new Thread(this, "BioReceiver" + channelName);
t.setDaemon(true);
t.start();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1740242&r1=1740241&r2=1740242&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Thu Apr 21 07:09:45 2016
@@ -89,7 +89,7 @@ public class NioReceiver extends Receive
getBind();
bind();
String channelName = "";
- if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+ if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
Thread t = new Thread(this, "NioReceiver" + channelName);
t.setDaemon(true);
t.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
