Repository: incubator-ignite Updated Branches: refs/heads/ignite-51 4c0cc9acc -> ea39d669b
# ignite-51 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/874a0009 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/874a0009 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/874a0009 Branch: refs/heads/ignite-51 Commit: 874a0009f1e94abbd63ead3638f4d973dd45a85e Parents: 99d62df Author: sboikov <sboi...@gridgain.com> Authored: Mon Mar 2 17:46:17 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Mar 2 17:46:17 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMapEntry.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/874a0009/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 77a7343..21255e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -440,7 +440,19 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { info.setDeleted(deletedUnlocked()); if (!expired) { - info.value(val); + CacheObject val0 = val; + + if (val0 == null && valPtr != 0) { + IgniteBiTuple<byte[], Boolean> t = valueBytes0(); + + if (t.get2()) + val0 = cctx.toCacheObject(t.get1(), null); + else + val0 = cctx.toCacheObject(null, t.get1()); + + } + + info.value(val0); // TODO IGNITE-51. // info.value(cctx.kernalContext().config().isPeerClassLoadingEnabled() ? // rawGetOrUnmarshalUnlocked(false) : val);
