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/05 09:36:35 UTC
svn commit: r1737795 - in /tomcat/tc8.0.x/trunk:
java/org/apache/catalina/tribes/group/interceptors/
java/org/apache/catalina/tribes/membership/ webapps/docs/
Author: kfujino
Date: Tue Apr 5 07:36:34 2016
New Revision: 1737795
URL: http://svn.apache.org/viewvc?rev=1737795&view=rev
Log:
Add the flag indicating that member is a localMember.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1737795&r1=1737794&r2=1737795&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java Tue Apr 5 07:36:34 2016
@@ -28,6 +28,7 @@ import org.apache.catalina.tribes.group.
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.XByteBuffer;
+import org.apache.catalina.tribes.membership.StaticMember;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -67,6 +68,7 @@ public class StaticMembershipInterceptor
public void setLocalMember(Member member) {
this.localMember = member;
+ ((StaticMember)localMember).setLocal(true);
}
@Override
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1737795&r1=1737794&r2=1737795&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java Tue Apr 5 07:36:34 2016
@@ -155,6 +155,7 @@ public class McastService implements Mem
localMember.setUniqueId(UUIDGenerator.randomUUID(true));
localMember.setPayload(getPayload());
localMember.setDomain(getDomain());
+ localMember.setLocal(true);
}
localMember.setSecurePort(securePort);
localMember.setUdpPort(udpPort);
@@ -305,6 +306,7 @@ public class McastService implements Mem
if ( localMember == null ) {
localMember = new MemberImpl(host, port, 100);
localMember.setUniqueId(UUIDGenerator.randomUUID(true));
+ localMember.setLocal(true);
} else {
localMember.setHostname(host);
localMember.setPort(port);
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1737795&r1=1737794&r2=1737795&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue Apr 5 07:36:34 2016
@@ -109,6 +109,11 @@ public class MemberImpl implements Membe
protected volatile byte[] domain = new byte[0];
/**
+ * The flag indicating that this member is a local member.
+ */
+ protected volatile boolean local = false;
+
+ /**
* Empty constructor for serialization
*/
public MemberImpl() {
@@ -653,6 +658,14 @@ public class MemberImpl implements Membe
this.dataPkg = null;
}
+ public boolean isLocal() {
+ return local;
+ }
+
+ public void setLocal(boolean local) {
+ this.local = local;
+ }
+
@Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
int length = in.readInt();
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1737795&r1=1737794&r2=1737795&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml Tue Apr 5 07:36:34 2016
@@ -156,6 +156,12 @@
description="The upd port the member is listening on"
type="int"
writeable="false"/>
+ <attribute
+ name="local"
+ description="The flag indicating that this member is a local member"
+ type="boolean"
+ is="true"
+ writeable="false"/>
</mbean>
<mbean
name="StaticMember"
@@ -221,5 +227,11 @@
description="The upd port the member is listening on"
type="int"
writeable="false"/>
+ <attribute
+ name="local"
+ description="The flag indicating that this member is a local member"
+ type="boolean"
+ is="true"
+ writeable="false"/>
</mbean>
</mbeans-descriptors>
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1737795&r1=1737794&r2=1737795&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Apr 5 07:36:34 2016
@@ -124,6 +124,9 @@
<add>
Add log of when received an unexpected messages. (kfujino)
</add>
+ <add>
+ Add the flag indicating that member is a localMember. (kfujino)
+ </add>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org