Repository: ignite Updated Branches: refs/heads/ignite-4932 aa0ecf820 -> c5c1720d3
ignite-4932 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5c1720d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5c1720d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5c1720d Branch: refs/heads/ignite-4932 Commit: c5c1720d3304fbec8665c204c9f1e38fdec6f831 Parents: aa0ecf8 Author: sboikov <[email protected]> Authored: Thu Apr 13 13:24:15 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Apr 13 13:24:15 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 45 ++++++-------------- 1 file changed, 13 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c5c1720d/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 5d86f74..05b4761 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 @@ -1990,38 +1990,19 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V } } else { - if (needVer || readerArgs != null) { - res = entry.innerGetVersioned( - null, - null, - ctx.isSwapOrOffheapEnabled(), - /*unmarshal*/true, - updateMetrics, - evt, - subjId, - null, - taskName, - expiry, - !deserializeBinary, - readerArgs); - } - else { - CacheObject val = entry.innerGet( - null, - null, - ctx.isSwapOrOffheapEnabled(), - false, - updateMetrics, - evt, - false, - subjId, - null, - taskName, - expiry, - !deserializeBinary); - - res = val != null ? new EntryGetResult(val, null) : null; - } + res = entry.innerGetVersioned( + null, + null, + ctx.isSwapOrOffheapEnabled(), + /*unmarshal*/true, + updateMetrics, + evt, + subjId, + null, + taskName, + expiry, + !deserializeBinary, + readerArgs); if (res == null) ctx.evicts().touch(entry, topVer);
