#ignite-51: fix GridCacheReplicatedPreloadSelfTest.testDeployment()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed960211 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed960211 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed960211 Branch: refs/heads/ignite-410 Commit: ed9602112095e572bf72f95e18cf9d0ac59a9410 Parents: 52c6106 Author: ivasilinets <vasilinetc....@gmail.com> Authored: Mon Mar 9 23:45:44 2015 +0300 Committer: ivasilinets <vasilinetc....@gmail.com> Committed: Mon Mar 9 23:45:44 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed960211/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 4762c03..0307b04 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 @@ -3157,8 +3157,13 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { if (val != null) return val; - if (valPtr != 0) - return cctx.fromOffheap(valPtr, tmp); + if (valPtr != 0) { + CacheObject val0 = cctx.fromOffheap(valPtr, tmp); + + val0.finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader()); + + return val0; + } return null; }
