geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vfor...@apache.org
Subject [01/50] [abbrv] incubator-geode git commit: GEODE-334: A NullPointerException can sometimes be thrown from CacheServerBridge getUniqueClientIds
Date Wed, 25 Nov 2015 19:07:14 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-78 ee567c311 -> f29845a0c


GEODE-334: A NullPointerException can sometimes be thrown from CacheServerBridge getUniqueClientIds

Incorporated changes from GemFire


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

Branch: refs/heads/feature/GEODE-78
Commit: 6fe66f32c008d8d99a5e94eee5fa979296f1ad5f
Parents: 2c99b9e
Author: Barry Oglesby <boglesby@pivotal.io>
Authored: Wed Sep 16 16:43:55 2015 -0700
Committer: Barry Oglesby <boglesby@pivotal.io>
Committed: Wed Sep 16 16:43:55 2015 -0700

----------------------------------------------------------------------
 .../gemfire/management/internal/beans/CacheServerBridge.java       | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6fe66f32/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java
index 65e2c5a..012b8ec 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/beans/CacheServerBridge.java
@@ -350,11 +350,13 @@ public class CacheServerBridge extends ServerBridge{
       }
       for (ServerConnection conn : serverConnections) {
         ClientProxyMembershipID clientId = conn.getProxyID();
+        if (clientId != null) { // Check added to fix bug 51987
         if (uniqueIds.get(clientId.getDSMembership()) == null) {
           ClientConnInfo clientConInfo = new ClientConnInfo(conn.getProxyID(), conn.getSocketHost(),
               conn.getSocketPort(), false);
           uniqueIds.put(clientId.getDSMembership(), clientConInfo);
         }
+        }
       }
     }
 


Mime
View raw message