Repository: ignite Updated Branches: refs/heads/ignite-1537 3ebdeb4ba -> ef72ab7df
ignite-1.5 Should not wait on preloader sync future for system caches callbacks. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef72ab7d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef72ab7d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef72ab7d Branch: refs/heads/ignite-1537 Commit: ef72ab7dfb81528881c1b5d8a500f79dddd4c769 Parents: 3ebdeb4 Author: sboikov <[email protected]> Authored: Mon Nov 30 14:42:24 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 30 14:42:24 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ef72ab7d/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 e1f2ade..aa06a24 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 @@ -1546,7 +1546,11 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (expiryPlc != null && !readFromStore && !cctx.putIfAbsentFilter(filter) && hasValueUnlocked()) updateTtl(expiryPlc); - return new T3<>(false, retval ? CU.value(old, cctx, false) : null, null); + Object val = retval ? + cctx.cacheObjectContext().unwrapPortableIfNeeded(CU.value(old, cctx, false), keepBinary, false) + : null; + + return new T3<>(false, val, null); } }
