geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [16/50] [abbrv] geode git commit: GEODE-2192 Fixed NPE in GMSLocator. Added null check for publickey
Date Wed, 14 Dec 2016 17:57:31 GMT
GEODE-2192 Fixed NPE in GMSLocator. Added null check for publickey


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f22809a4
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f22809a4
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f22809a4

Branch: refs/heads/feature/GEODE-1930
Commit: f22809a448ba5ab177be0d1d790f0ec91801d0f0
Parents: 2075ee3
Author: Hitesh Khamesra <hkhamesra@pivotal.io>
Authored: Thu Dec 8 13:40:34 2016 -0800
Committer: Hitesh Khamesra <hkhamesra@pivotal.io>
Committed: Thu Dec 8 13:40:34 2016 -0800

----------------------------------------------------------------------
 .../internal/membership/gms/locator/GMSLocator.java         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/f22809a4/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/locator/GMSLocator.java
----------------------------------------------------------------------
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 25cb50f..dd73492 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
@@ -188,9 +188,12 @@ public class GMSLocator implements Locator, NetLocator {
         services.getMessenger().setPublicKey(findRequest.getMyPublicKey(),
             findRequest.getMemberID());
       } else {
-        // GMSEncrypt.registerMember(findRequest.getMyPublicKey(), findRequest.getMemberID());
-        registerMbrVsPK.put(new InternalDistributedMemberWrapper(findRequest.getMemberID()),
-            findRequest.getMyPublicKey());
+        // GMSEncrypt.registerMember(findRequest.getMyPublicKey(),
+        // findRequest.getMemberID());
+        if (findRequest.getMyPublicKey() != null) {
+          registerMbrVsPK.put(new InternalDistributedMemberWrapper(findRequest.getMemberID()),
+              findRequest.getMyPublicKey());
+        }
       }
       if (findRequest.getMemberID() != null) {
         InternalDistributedMember coord = null;


Mime
View raw message