GEODE-67: fix nonTxnFindObject for partitioned region The partitioned region code path on nonTxnFindObject now propagates isCreate, requestingClient, clientEvent, and returnTombstones.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7d830c5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7d830c5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7d830c5b Branch: refs/heads/feature/GEODE-420 Commit: 7d830c5b0196ae96f6d5185b62536f58dfc85ff0 Parents: b2b5fca Author: Darrel Schneider <[email protected]> Authored: Tue Aug 16 15:23:17 2016 -0700 Committer: Darrel Schneider <[email protected]> Committed: Wed Aug 17 11:18:52 2016 -0700 ---------------------------------------------------------------------- .../java/com/gemstone/gemfire/internal/cache/LocalRegion.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d830c5b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java index 304a5ad..461ad3d 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java @@ -1545,9 +1545,8 @@ public class LocalRegion extends AbstractRegion // This code was moved from PartitionedRegion.nonTxnFindObject(). That method has been removed. // For PRs we don't want to deserialize the value and we can't use findObjectInSystem because // it can invoke code that is transactional. - result = getSharedDataView().findObject(keyInfo, this, true/*isCreate*/, generateCallbacks, - localValue, disableCopyOnRead, preferCD, null, null, false); - // TODO why are we not passing the client event or returnTombstones in the above invokation? + result = getSharedDataView().findObject(keyInfo, this, isCreate, generateCallbacks, + localValue, disableCopyOnRead, preferCD, requestingClient, clientEvent, returnTombstones); } if (result == null && localValue != null) {
