Repository: ignite Updated Branches: refs/heads/ignite-1607 7352e2e9e -> 6c49ff495
ignite-1607 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c49ff49 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c49ff49 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c49ff49 Branch: refs/heads/ignite-1607 Commit: 6c49ff49544f19177757d292370ad435b257eeee Parents: 7352e2e Author: sboikov <[email protected]> Authored: Fri Oct 16 16:47:51 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Oct 16 16:47:51 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearGetFuture.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c49ff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index ab0bb20..b89d688 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -529,13 +529,21 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap add(new GridFinishedFuture<>(Collections.singletonMap((K)key, val0))); } else { - K key0 = key.value(cctx.cacheObjectContext(), true); - V val0 = v.value(cctx.cacheObjectContext(), true); + if (keepCacheObjects) { + K key0 = (K)key; + V val0 = (V)(skipVals ? true : v); - val0 = (V)cctx.unwrapPortableIfNeeded(val0, !deserializePortable); - key0 = (K)cctx.unwrapPortableIfNeeded(key0, !deserializePortable); + add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); + } + else { + K key0 = key.value(cctx.cacheObjectContext(), true); + V val0 = v.value(cctx.cacheObjectContext(), true); - add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); + val0 = (V)cctx.unwrapPortableIfNeeded(val0, !deserializePortable); + key0 = (K)cctx.unwrapPortableIfNeeded(key0, !deserializePortable); + + add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); + } } } else {
