Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0F876200C77 for ; Mon, 1 May 2017 23:42:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0E04D160BAE; Mon, 1 May 2017 21:42:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 55AC8160BA0 for ; Mon, 1 May 2017 23:42:40 +0200 (CEST) Received: (qmail 37653 invoked by uid 500); 1 May 2017 21:42:39 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 37644 invoked by uid 99); 1 May 2017 21:42:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 May 2017 21:42:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5D394DFBC7; Mon, 1 May 2017 21:42:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhouxj@apache.org To: commits@geode.apache.org Message-Id: <87a2b1fbe01644fb88713ebfe2c90f5c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: geode-2848: when found all the partitioned region is destroyed, add back the events Date: Mon, 1 May 2017 21:42:39 +0000 (UTC) archived-at: Mon, 01 May 2017 21:42:41 -0000 Repository: geode Updated Branches: refs/heads/feature/GEM-1353 f1b14b0dd -> 8fdd0fbd7 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/8fdd0fbd Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/8fdd0fbd Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/8fdd0fbd Branch: refs/heads/feature/GEM-1353 Commit: 8fdd0fbd7284077e7244808b8321bdaf843957c2 Parents: f1b14b0 Author: zhouxh Authored: Mon May 1 14:41:22 2017 -0700 Committer: zhouxh Committed: Mon May 1 14:41:22 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/8fdd0fbd/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 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; }