You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2018/12/17 10:52:44 UTC

svn commit: r1849075 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java

Author: remm
Date: Mon Dec 17 10:52:44 2018
New Revision: 1849075

URL: http://svn.apache.org/viewvc?rev=1849075&view=rev
Log:
Add missing code to match the local member.

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java?rev=1849075&r1=1849074&r2=1849075&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java Mon Dec 17 10:52:44 2018
@@ -79,6 +79,15 @@ public class DNSMembershipProvider exten
             for (InetAddress inetAddress : inetAddresses) {
                 String ip = inetAddress.getHostAddress();
                 byte[] id = md5.digest(ip.getBytes());
+                // We found ourselves, ignore
+                if (inetAddress.getHostName().equals(hostName)) {
+                    // Update the UID on initial lookup
+                    Member localMember = service.getLocalMember(false);
+                    if (localMember.getUniqueId() == CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {
+                        ((MemberImpl) localMember).setUniqueId(id);
+                    }
+                    continue;
+                }
                 long aliveTime = -1;
                 MemberImpl member = null;
                 try {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org