ignite-1.6 Unwrap offheap object before pass it to continuous query (cherry picked from commit 3319d2a)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0442d2b0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0442d2b0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0442d2b0 Branch: refs/heads/ignite-3163 Commit: 0442d2b02bf02d78372447541ae6c6f9d9e2809e Parents: 847399a Author: sboikov <[email protected]> Authored: Fri May 13 16:14:54 2016 +0300 Committer: sboikov <[email protected]> Committed: Mon May 16 10:20:58 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMapEntry.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0442d2b0/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 8262113..b4a3987 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 @@ -2514,14 +2514,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme // Continuous query filter should be perform under lock. if (lsnrs != null) { - CacheObject evtVal = updated; - CacheObject evtOldVal = oldVal; - - if (isOffHeapValuesOnly()) { - evtVal = cctx.toCacheObject(cctx.unwrapTemporary(evtVal)); - - evtOldVal = cctx.toCacheObject(cctx.unwrapTemporary(evtOldVal)); - } + CacheObject evtVal = cctx.unwrapTemporary(updated); + CacheObject evtOldVal = cctx.unwrapTemporary(oldVal); cctx.continuousQueries().onEntryUpdated(lsnrs, key, evtVal, evtOldVal, internal, partition(), primary, false, updateCntr0, fut, topVer);
