Repository: ignite Updated Branches: refs/heads/ignite-5009 956e02938 -> ea0cdf3e3
ignite-5009 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea0cdf3e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea0cdf3e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea0cdf3e Branch: refs/heads/ignite-5009 Commit: ea0cdf3e3ad740839cbdfc0300850b531d0adcc9 Parents: 956e029 Author: sboikov <[email protected]> Authored: Mon Apr 24 23:01:24 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Apr 24 23:18:24 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0cdf3e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index d2bbeaf..9e65419 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -1957,7 +1957,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V final boolean storeEnabled = !skipVals && readThrough && ctx.readThrough(); - boolean readNoEntry = ctx.readNoEntry(expiry, false); + boolean readNoEntry = ctx.readNoEntry(expiry, readerArgs != null); for (KeyCacheObject key : keys) { while (true) { http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0cdf3e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 96231f4..583713b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -480,7 +480,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte key, row.value(), skipVals, - false, + keepCacheObj, deserializeBinary, true, null, @@ -596,12 +596,12 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte context().evicts().touch(entry, topVer); } } - - if (!success) - break; - else if (!skipVals && ctx.config().isStatisticsEnabled()) - ctx.cache().metrics0().onRead(true); } + + if (!success) + break; + else if (!skipVals && ctx.config().isStatisticsEnabled()) + ctx.cache().metrics0().onRead(true); } if (success) {
