Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-773-2 3504a05ff -> 25d5db399
Fixing an NPE that showed up in an integration test. Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fd88a6a9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fd88a6a9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fd88a6a9 Branch: refs/heads/feature/GEODE-773-2 Commit: fd88a6a9a55a4ac06cb083698313bcb7a09973ea Parents: c8c26e6 Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Mon Feb 8 15:54:28 2016 -0800 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Mon Feb 8 15:54:28 2016 -0800 ---------------------------------------------------------------------- .../distributed/internal/InternalDistributedSystem.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fd88a6a9/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java index 5762463..276efec 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java @@ -778,7 +778,8 @@ public class InternalDistributedSystem * @since 5.7 */ private void endInitLocator() throws IOException { - if (startedLocator != null) { + InternalLocator loc = this.startedLocator; + if (loc != null) { String locatorString = this.originalConfig.getStartLocator(); // DistributionLocatorId locId = new DistributionLocatorId(locatorString); boolean finished = false; @@ -787,14 +788,14 @@ public class InternalDistributedSystem // start server location services in order to be able to log information // about the use of cache servers // if(locId.isServerLocator()) { - this.startedLocator.startServerLocation(this); + loc.startServerLocation(this); // } - this.startedLocator.endStartLocator(this); + loc.endStartLocator(this); finished = true; } finally { if (!finished) { - this.startedLocator.stop(); + loc.stop(); } } }
