geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject [2/2] incubator-geode git commit: GEODE-77 fixing NPE encountered in ProductUseLogDUnitTest
Date Tue, 08 Sep 2015 21:55:19 GMT
GEODE-77 fixing NPE encountered in ProductUseLogDUnitTest


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

Branch: refs/heads/feature/GEODE-77
Commit: 505b45df34f9b2d751c2a21d478f372225725622
Parents: 9d01654
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Tue Sep 8 14:54:50 2015 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Tue Sep 8 14:54:50 2015 -0700

----------------------------------------------------------------------
 .../gemfire/distributed/internal/membership/gms/Services.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/505b45df/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
index efc95ac..5f32842 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
@@ -108,7 +108,7 @@ public class Services {
     this.joinLeave.init(this);
     this.healthMon.init(this);
     InternalLocator l = (InternalLocator)com.gemstone.gemfire.distributed.Locator.getLocator();
-    if (l != null) {
+    if (l != null && l.getLocatorHandler() != null) {
       l.getLocatorHandler().setMembershipManager((MembershipManager)this.manager);
       this.locator = (Locator)l.getLocatorHandler();
     }


Mime
View raw message