Author: kfujino Date: Tue Apr 5 07:40:25 2016 New Revision: 1737796 URL: http://svn.apache.org/viewvc?rev=1737796&view=rev Log: Add the flag indicating that member is a localMember.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.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/MemberImpl.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=1737796&r1=1737795&r2=1737796&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java Tue Apr 5 07:40:25 2016 @@ -65,6 +65,7 @@ public class StaticMembershipInterceptor public void setLocalMember(Member member) { this.localMember = member; + ((StaticMember)localMember).setLocal(true); } @Override 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=1737796&r1=1737795&r2=1737796&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 Tue Apr 5 07:40:25 2016 @@ -171,6 +171,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); @@ -391,6 +392,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/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1737796&r1=1737795&r2=1737796&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Tue Apr 5 07:40:25 2016 @@ -123,6 +123,11 @@ public class MemberImpl implements Membe protected 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() { @@ -646,6 +651,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/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml?rev=1737796&r1=1737795&r2=1737796&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml Tue Apr 5 07:40:25 2016 @@ -161,6 +161,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" @@ -226,5 +232,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/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1737796&r1=1737795&r2=1737796&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 5 07:40:25 2016 @@ -253,6 +253,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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org