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 4C66C2009A8 for ; Tue, 17 May 2016 18:58:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4ADFA1609F5; Tue, 17 May 2016 16:58:37 +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 937441607A8 for ; Tue, 17 May 2016 18:58:36 +0200 (CEST) Received: (qmail 1096 invoked by uid 500); 17 May 2016 16:58:35 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 1087 invoked by uid 99); 17 May 2016 16:58:35 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2016 16:58:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 5DA8E1A0850 for ; Tue, 17 May 2016 16:58:35 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 7sYoXuC0KNk7 for ; Tue, 17 May 2016 16:58:34 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id 239A460E1B for ; Tue, 17 May 2016 16:58:32 +0000 (UTC) Received: (qmail 1050 invoked by uid 99); 17 May 2016 16:58:32 -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; Tue, 17 May 2016 16:58:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F073DFB14; Tue, 17 May 2016 16:58:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dschneider@apache.org To: commits@geode.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-1401: handle NOT_AVAILABLE in callers of getRawOldValue Date: Tue, 17 May 2016 16:58:32 +0000 (UTC) archived-at: Tue, 17 May 2016 16:58:37 -0000 Repository: incubator-geode Updated Branches: refs/heads/develop 11da98d4a -> ab417e32d GEODE-1401: handle NOT_AVAILABLE in callers of getRawOldValue Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ab417e32 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ab417e32 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ab417e32 Branch: refs/heads/develop Commit: ab417e32deccb4e398d21e182bb738af9ef65e24 Parents: 11da98d Author: Darrel Schneider Authored: Mon May 16 16:57:56 2016 -0700 Committer: Darrel Schneider Committed: Tue May 17 09:58:09 2016 -0700 ---------------------------------------------------------------------- .../gemfire/internal/cache/BucketRegionQueue.java | 10 ++-------- .../gemstone/gemfire/internal/cache/EntryEventImpl.java | 2 +- .../gemfire/internal/cache/RemoteDestroyMessage.java | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ab417e32/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java index 0243cde..a3d9d97 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java @@ -269,10 +269,7 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue { requireOldValue, lastModified, overwriteDestroyed); if (success) { - Object ov = event.getRawOldValue(); - if (ov instanceof GatewaySenderEventImpl) { - ((GatewaySenderEventImpl) ov).release(); - } + GatewaySenderEventImpl.release(event.getRawOldValue()); if (getPartitionedRegion().getColocatedWith() == null) { return success; @@ -370,10 +367,7 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue { } super.basicDestroy(event, cacheWrite, expectedOldValue); - Object rov = event.getRawOldValue(); - if (rov instanceof GatewaySenderEventImpl) { - ((GatewaySenderEventImpl) rov).release(); - } + GatewaySenderEventImpl.release(event.getRawOldValue()); // Primary buckets should already remove the key while peeking if (!this.getBucketAdvisor().isPrimary()) { if (logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ab417e32/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java index e241622..b833ecb 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryEventImpl.java @@ -1407,7 +1407,7 @@ public class EntryEventImpl importer.importOldObject(cdV, true); } } else { - importer.importOldObject(ov, true); + importer.importOldObject(AbstractRegion.handleNotAvailable(ov), true); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ab417e32/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java index bb97d9c..f7109bb 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/RemoteDestroyMessage.java @@ -232,7 +232,7 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply setOldValBytes((byte[]) old); } else { this.oldValueIsSerialized = true; - setOldValObj(old); + setOldValObj(AbstractRegion.handleNotAvailable(old)); } } }