You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2016/04/20 07:04:19 UTC
svn commit: r1740047 - in
/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes: group/
group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Author: kfujino
Date: Wed Apr 20 05:04:19 2016
New Revision: 1740047
URL: http://svn.apache.org/viewvc?rev=1740047&view=rev
Log:
Change the channel field to protected.
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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 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(getChannel());
+ ((ReceiverBase)clusterReceiver).setChannel(channel);
}
clusterReceiver.start();
//synchronize, big time FIXME
- Member localMember = getChannel().getLocalMember(false);
+ Member localMember = channel.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(getChannel());
+ ((ReplicationTransmitter)clusterSender).setChannel(channel);
}
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(getChannel());
+ ((McastService)membershipService).setChannel(channel);
}
membershipService.start(MembershipService.MBR_RX);
valid = true;
}
if ( Channel.MBR_TX_SEQ==(svc & Channel.MBR_TX_SEQ) ) {
if (membershipService instanceof McastService) {
- ((McastService)membershipService).setChannel(getChannel());
+ ((McastService)membershipService).setChannel(channel);
}
membershipService.start(MembershipService.MBR_TX);
valid = true;
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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -30,7 +30,7 @@ public abstract class ChannelInterceptor
private ChannelInterceptor next;
private ChannelInterceptor previous;
- private Channel channel;
+ protected 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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -84,8 +84,8 @@ public class MessageDispatch15Intercepto
public void startQueue() {
if ( run ) return;
String channelName = "";
- if (getChannel() instanceof GroupChannel && ((GroupChannel)getChannel()).getName() != null) {
- channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+ if (channel instanceof GroupChannel && ((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -90,8 +90,8 @@ public class MessageDispatchInterceptor
public void startQueue() {
msgDispatchThread = new Thread(this);
String channelName = "";
- if (getChannel() instanceof GroupChannel && ((GroupChannel)getChannel()).getName() != null) {
- channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+ if (channel instanceof GroupChannel && ((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -70,9 +70,8 @@ public class TcpPingInterceptor extends
thread = new PingThread();
thread.setDaemon(true);
String channelName = "";
- if (getChannel() instanceof GroupChannel
- && ((GroupChannel)getChannel()).getName() != null) {
- channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+ if (channel instanceof GroupChannel && ((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -84,7 +84,7 @@ public class McastService implements Mem
protected byte[] domain;
- private Channel channel;
+ protected 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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -151,7 +151,7 @@ public class McastServiceImpl
*/
protected boolean localLoopbackDisabled = false;
- private Channel channel;
+ protected Channel channel;
/**
* Create a new mcast service impl
@@ -613,9 +613,9 @@ public class McastServiceImpl
Thread t = new RecoveryThread(parent);
String channelName = "";
- if (parent.getChannel() instanceof GroupChannel
- && ((GroupChannel)parent.getChannel()).getName() != null) {
- channelName = "[" + ((GroupChannel)parent.getChannel()).getName() + "]";
+ if (parent.channel instanceof GroupChannel
+ && ((GroupChannel)parent.channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)parent.channel).getName() + "]";
}
t.setName("Tribes-MembershipRecovery" + channelName);
t.setDaemon(true);
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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -88,7 +88,7 @@ public abstract class ReceiverBase imple
private long maxIdleTime = 60000;
private ExecutorService executor;
- private Channel channel;
+ protected 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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -34,7 +34,7 @@ import org.apache.catalina.tribes.util.S
*/
public class ReplicationTransmitter implements ChannelSender {
- private Channel channel;
+ protected 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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -56,9 +56,8 @@ public class BioReceiver extends Receive
getBind();
bind();
String channelName = "";
- if (getChannel() instanceof GroupChannel
- && ((GroupChannel)getChannel()).getName() != null) {
- channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+ if (channel instanceof GroupChannel && ((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 2016
@@ -110,9 +110,8 @@ public class NioReceiver extends Receive
getBind();
bind();
String channelName = "";
- if (getChannel() instanceof GroupChannel
- && ((GroupChannel)getChannel()).getName() != null) {
- channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+ if (channel instanceof GroupChannel && ((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).getName() + "]";
}
Thread t = new Thread(this, "NioReceiver" + channelName);
t.setDaemon(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1740047 - in
/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes: group/
group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Konstantin,
On 4/20/16 5:15 AM, Konstantin Kolinko wrote:
> 2016-04-20 8:04 GMT+03:00 <kf...@apache.org>:
>> Author: kfujino
>> Date: Wed Apr 20 05:04:19 2016
>> New Revision: 1740047
>>
>> URL: http://svn.apache.org/viewvc?rev=1740047&view=rev
>> Log:
>> Change the channel field to protected.
>>
>> 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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 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(getChannel());
>> + ((ReceiverBase)clusterReceiver).setChannel(channel);
>> }
>> clusterReceiver.start();
>> //synchronize, big time FIXME
>> - Member localMember = getChannel().getLocalMember(false);
>> + Member localMember = channel.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(getChannel());
>> + ((ReplicationTransmitter)clusterSender).setChannel(channel);
>> }
>> valid = true;
>> clusterSender.start();
>
> [....]
>
>
> What is the reason for this change ? Are you tying to fix some bug here?
>
> In general, I do not like this change.
> When the code uses getters it gives us more flexibility in the future,
> allowing to change the implementation. In ReceiverBase class there
> are a lot of private fields. Why make 'channel' a protected one?
+1 to Konstantin's review. Making channel protected is okay (but might
be unnecessary), but the accessor methods should continue to be used.
-chris
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1740047 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes:
group/ group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Posted by Keiichi Fujino <kf...@apache.org>.
2016-04-20 18:15 GMT+09:00 Konstantin Kolinko <kn...@gmail.com>:
> 2016-04-20 8:04 GMT+03:00 <kf...@apache.org>:
> > Author: kfujino
> > Date: Wed Apr 20 05:04:19 2016
> > New Revision: 1740047
> >
> > URL: http://svn.apache.org/viewvc?rev=1740047&view=rev
> > Log:
> > Change the channel field to protected.
> >
> > 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=1740047&r1=1740046&r2=1740047&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
> Wed Apr 20 05:04:19 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(getChannel());
> > + ((ReceiverBase)clusterReceiver).setChannel(channel);
> > }
> > clusterReceiver.start();
> > //synchronize, big time FIXME
> > - Member localMember = getChannel().getLocalMember(false);
> > + Member localMember = channel.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(getChannel());
> > +
> ((ReplicationTransmitter)clusterSender).setChannel(channel);
> > }
> > valid = true;
> > clusterSender.start();
>
> [....]
>
>
> What is the reason for this change ? Are you tying to fix some bug here?
>
> In general, I do not like this change.
> When the code uses getters it gives us more flexibility in the future,
> allowing to change the implementation. In ReceiverBase class there
> are a lot of private fields. Why make 'channel' a protected one?
>
>
I simply thought each channelInterceptor uses the channel instance directly.
The other fix were aligned with the ChannelInterceptorBase.
Because I do not stick to this fix, I will revert this fix later.
Thanks.
> Best regards,
> Konstantin Kolinko
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
> --
> Keiichi.Fujino
> <de...@tomcat.apache.org>
> <de...@tomcat.apache.org>
>
Re: svn commit: r1740047 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes:
group/ group/interceptors/ membership/ transport/ transport/bio/ transport/nio/
Posted by Konstantin Kolinko <kn...@gmail.com>.
2016-04-20 8:04 GMT+03:00 <kf...@apache.org>:
> Author: kfujino
> Date: Wed Apr 20 05:04:19 2016
> New Revision: 1740047
>
> URL: http://svn.apache.org/viewvc?rev=1740047&view=rev
> Log:
> Change the channel field to protected.
>
> 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=1740047&r1=1740046&r2=1740047&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 Wed Apr 20 05:04:19 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(getChannel());
> + ((ReceiverBase)clusterReceiver).setChannel(channel);
> }
> clusterReceiver.start();
> //synchronize, big time FIXME
> - Member localMember = getChannel().getLocalMember(false);
> + Member localMember = channel.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(getChannel());
> + ((ReplicationTransmitter)clusterSender).setChannel(channel);
> }
> valid = true;
> clusterSender.start();
[....]
What is the reason for this change ? Are you tying to fix some bug here?
In general, I do not like this change.
When the code uses getters it gives us more flexibility in the future,
allowing to change the implementation. In ReceiverBase class there
are a lot of private fields. Why make 'channel' a protected one?
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org