You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2017/05/01 21:59:31 UTC
[7/7] geode git commit: geode-2848: when found all the partitioned
region is destroyed, add back the events
geode-2848: when found all the partitioned region is destroyed, add back the
events
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/08ba1244
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/08ba1244
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/08ba1244
Branch: refs/heads/feature/GEM-1353
Commit: 08ba1244d6c19f0a753a520f18400f9747093885
Parents: c2e7d1f
Author: zhouxh <gz...@pivotal.io>
Authored: Mon May 1 14:41:22 2017 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Mon May 1 14:57:44 2017 -0700
----------------------------------------------------------------------
.../cache/wan/parallel/ParallelGatewaySenderQueue.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/08ba1244/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 9696b90..82e6f68 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1724,6 +1724,8 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
ParallelQueueRemovalMessage pqrm = new ParallelQueueRemovalMessage(temp);
pqrm.setRecipients(recipients);
dm.putOutgoing(pqrm);
+ } else {
+ regionToDispatchedKeysMap.putAll(temp);
}
} // be somewhat tolerant of failures
@@ -1773,8 +1775,10 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
private Set<InternalDistributedMember> getAllRecipients(GemFireCacheImpl cache, Map map) {
Set recipients = new ObjectOpenHashSet();
for (Object pr : map.keySet()) {
- recipients.addAll(((PartitionedRegion) (cache.getRegion((String) pr))).getRegionAdvisor()
- .adviseDataStore());
+ PartitionedRegion partitionedRegion = (PartitionedRegion) cache.getRegion((String) pr);
+ if (partitionedRegion != null && partitionedRegion.getRegionAdvisor() != null) {
+ recipients.addAll(partitionedRegion.getRegionAdvisor().adviseDataStore());
+ }
}
return recipients;
}