Repository: geode Updated Branches: refs/heads/feature/GEM-1483 10b3af5aa -> 1e8095dcc
fix-4 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/1e8095dc Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/1e8095dc Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/1e8095dc Branch: refs/heads/feature/GEM-1483 Commit: 1e8095dcc911a64080d037a62f0f929f54f2386e Parents: 10b3af5 Author: zhouxh <[email protected]> Authored: Wed Jun 21 18:11:21 2017 -0700 Committer: zhouxh <[email protected]> Committed: Wed Jun 21 18:11:21 2017 -0700 ---------------------------------------------------------------------- .../geode/internal/cache/PartitionedRegionDataStore.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/1e8095dc/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java index 37667a7..9dc0a18 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java @@ -1418,6 +1418,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { } public boolean isRemotePrimaryReadyForColocatedChildren(int bucketId) { + boolean isRemotePrimaryReady = true; InternalDistributedMember myId = this.partitionedRegion.getDistributionManager().getDistributionManagerId(); @@ -1439,13 +1440,13 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { } else { if (logger.isDebugEnabled()) { logger - .debug(pr + " bucketId=" + bucketId + " has remove primary, checking its children"); + .debug(pr + " bucketId=" + bucketId + " has remote primary, checking its children"); } - return pr.getDataStore().isRemotePrimaryReadyForColocatedChildren(bucketId); + isRemotePrimaryReady = isRemotePrimaryReady && pr.getDataStore().isRemotePrimaryReadyForColocatedChildren(bucketId); } } } - return true; + return isRemotePrimaryReady; } /**
