[geode] branch develop updated: GEODE-5728: Allow null coordinator in equals() (#2507)

[khowe]

This is an automated email from the ASF dual-hosted git repository.

khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 763d2ac  GEODE-5728: Allow null coordinator in equals() (#2507)
763d2ac is described below

commit 763d2ac3c3852c3be1fa6ad642b8d29c3ca4e19d
Author: Dale Emery <d...@dhemery.com>
AuthorDate: Tue Sep 25 09:38:05 2018 -0700

    GEODE-5728: Allow null coordinator in equals() (#2507)
    
    The call to equals() assumed that coordinator was non-null, but
    coordinator may legitimately be null.
---
 .../geode/distributed/internal/membership/gms/locator/GMSLocator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
index 7a589b6..f376451 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
@@ -306,7 +306,7 @@ public class GMSLocator implements Locator, NetLocator {
       if (isCoordinator) {
         coordinator = localAddress;
 
-        if (v != null && !v.getCoordinator().equals(localAddress)) {
+        if (v != null && localAddress != null && 
!localAddress.equals(v.getCoordinator())) {
           logger.info("This member is becoming coordinator since view {}", v);
           v = null;
         }