You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/18 17:04:56 UTC
[16/19] incubator-geode git commit: GEODE-1401: handle NOT_AVAILABLE
in callers of getRawOldValue
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/147c1f01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/147c1f01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/147c1f01
Branch: refs/heads/feature/GEODE-1392
Commit: 147c1f01c73516195ad0a7e77f26169d5053de9d
Parents: bb64149
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon May 16 16:57:56 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 18 10:04:26 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/147c1f01/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/147c1f01/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/147c1f01/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));
}
}
}