Author: remm
Date: Mon Dec 17 18:46:37 2018
New Revision: 1849121
URL: http://svn.apache.org/viewvc?rev=1849121&view=rev
Log:
Protect from NPE in testcase.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/DNSMembershipProvider.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.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=1849121&r1=1849120&r2=1849121&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 18:46:37 2018
@@ -80,7 +80,7 @@ public class DNSMembershipProvider exten
String ip = inetAddress.getHostAddress();
byte[] id = md5.digest(ip.getBytes());
// We found ourselves, ignore
- if (localIp.equals(ip)) {
+ if (ip.equals(localIp)) {
// Update the UID on initial lookup
Member localMember = service.getLocalMember(false);
if (localMember.getUniqueId() ==
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java?rev=1849121&r1=1849120&r2=1849121&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/KubernetesMembershipProvider.java
Mon Dec 17 18:46:37 2018
@@ -200,7 +200,7 @@ public class KubernetesMembershipProvide
String uid = (objectUid == null) ? podIP :
objectUid.toString();
// We found ourselves, ignore
- if (localIp.equals(podIP)) {
+ if (podIP.equals(localIp)) {
// Update the UID on initial lookup
Member localMember = service.getLocalMember(false);
if (localMember.getUniqueId() ==
CloudMembershipService.INITIAL_ID && localMember instanceof MemberImpl) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
