Author: kfujino
Date: Thu Apr 21 07:12:24 2016
New Revision: 1740246
URL: http://svn.apache.org/viewvc?rev=1740246&view=rev
Log:
Revert r1740047.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.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/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
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=1740246&r1=1740245&r2=1740246&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
Thu Apr 21 07:12:24 2016
@@ -144,11 +144,11 @@ public class ChannelCoordinator extends
if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
clusterReceiver.setMessageListener(this);
if (clusterReceiver instanceof ReceiverBase) {
- ((ReceiverBase)clusterReceiver).setChannel(channel);
+ ((ReceiverBase)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;
@@ -167,7 +167,7 @@ public class ChannelCoordinator extends
}
if ( Channel.SND_TX_SEQ==(svc & Channel.SND_TX_SEQ) ) {
if (clusterSender instanceof ReplicationTransmitter) {
-
((ReplicationTransmitter)clusterSender).setChannel(channel);
+
((ReplicationTransmitter)clusterSender).setChannel(getChannel());
}
valid = true;
clusterSender.start();
@@ -177,14 +177,14 @@ public class ChannelCoordinator extends
membershipService.setMembershipListener(this);
if (membershipService instanceof McastService) {
((McastService)membershipService).setMessageListener(this);
- ((McastService)membershipService).setChannel(channel);
+ ((McastService)membershipService).setChannel(getChannel());
}
membershipService.start(MembershipService.MBR_RX);
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
if (membershipService instanceof McastService) {
- ((McastService)membershipService).setChannel(channel);
+ ((McastService)membershipService).setChannel(getChannel());
}
membershipService.start(MembershipService.MBR_TX);
valid = true;
@@ -246,7 +246,7 @@ public class ChannelCoordinator extends
}
startLevel = (startLevel & (~svc));
- channel = null;
+ setChannel(null);
}catch ( Exception x ) {
throw new ChannelException(x);
} finally {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1740246&r1=1740245&r2=1740246&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
Thu Apr 21 07:12:24 2016
@@ -30,7 +30,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/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=1740246&r1=1740245&r2=1740246&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
Thu Apr 21 07:12:24 2016
@@ -84,8 +84,9 @@ public class MessageDispatch15Intercepto
public void startQueue() {
if ( run ) return;
String channelName = "";
- if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
- channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ if (getChannel() instanceof GroupChannel
+ && ((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
}
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads,
keepAliveTime, TimeUnit.MILLISECONDS,
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1740246&r1=1740245&r2=1740246&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Thu Apr 21 07:12:24 2016
@@ -90,8 +90,9 @@ public class MessageDispatchInterceptor
public void startQueue() {
msgDispatchThread = new Thread(this);
String channelName = "";
- if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
- channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ if (getChannel() instanceof GroupChannel
+ && ((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
}
msgDispatchThread.setName("MessageDispatchInterceptor.MessageDispatchThread" +
channelName);
msgDispatchThread.setDaemon(true);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1740246&r1=1740245&r2=1740246&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Thu Apr 21 07:12:24 2016
@@ -70,8 +70,8 @@ public class TcpPingInterceptor extends
thread = new PingThread();
thread.setDaemon(true);
String channelName = "";
- if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
- channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ if (getChannel() instanceof GroupChannel &&
((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() +
"]";
}
thread.setName("TcpPingInterceptor.PingThread" + channelName
+"-"+cnt.addAndGet(1));
thread.start();
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=1740246&r1=1740245&r2=1740246&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
Thu Apr 21 07:12:24 2016
@@ -84,7 +84,7 @@ public class McastService implements Mem
protected byte[] domain;
- protected Channel channel;
+ private Channel channel;
/**
* Create a membership service.
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=1740246&r1=1740245&r2=1740246&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
Thu Apr 21 07:12:24 2016
@@ -151,7 +151,7 @@ public class McastServiceImpl
*/
protected boolean localLoopbackDisabled = false;
- protected Channel channel;
+ private Channel channel;
/**
* Create a new mcast service impl
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=1740246&r1=1740245&r2=1740246&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
Thu Apr 21 07:12:24 2016
@@ -88,7 +88,7 @@ public abstract class ReceiverBase imple
private long maxIdleTime = 60000;
private ExecutorService executor;
- protected Channel channel;
+ private Channel channel;
public ReceiverBase() {
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=1740246&r1=1740245&r2=1740246&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
Thu Apr 21 07:12:24 2016
@@ -34,7 +34,7 @@ import org.apache.catalina.tribes.util.S
*/
public class ReplicationTransmitter implements ChannelSender {
- protected Channel channel;
+ private Channel channel;
/**
* The descriptive information about this implementation.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1740246&r1=1740245&r2=1740246&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Thu Apr 21 07:12:24 2016
@@ -56,8 +56,9 @@ public class BioReceiver extends Receive
getBind();
bind();
String channelName = "";
- if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
- channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ if (getChannel() instanceof GroupChannel
+ && ((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() +
"]";
}
Thread t = new Thread(this, "BioReceiver" + channelName);
t.setDaemon(true);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1740246&r1=1740245&r2=1740246&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Thu Apr 21 07:12:24 2016
@@ -110,8 +110,9 @@ public class NioReceiver extends Receive
getBind();
bind();
String channelName = "";
- if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
- channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ if (getChannel() instanceof GroupChannel
+ && ((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() +
"]";
}
Thread t = new Thread(this, "NioReceiver" + channelName);
t.setDaemon(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
