Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 048D32009C5 for ; Mon, 16 May 2016 10:11:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 035F0160A16; Mon, 16 May 2016 08:11:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2161A160A25 for ; Mon, 16 May 2016 10:11:48 +0200 (CEST) Received: (qmail 97034 invoked by uid 500); 16 May 2016 08:11:48 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 96735 invoked by uid 99); 16 May 2016 08:11:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 May 2016 08:11:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F0CE9E9114; Mon, 16 May 2016 08:11:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Mon, 16 May 2016 08:11:59 -0000 Message-Id: <143d47a36b044ec5b5c2900d9057db6a@git.apache.org> In-Reply-To: <62bdd1ae0e764c4185e5dc1224b4970a@git.apache.org> References: <62bdd1ae0e764c4185e5dc1224b4970a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/18] ignite git commit: ignite-1.6 Unwrap offheap object before pass it to continuous query archived-at: Mon, 16 May 2016 08:11:50 -0000 ignite-1.6 Unwrap offheap object before pass it to continuous query Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3319d2a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3319d2a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3319d2a7 Branch: refs/heads/ignite-3098 Commit: 3319d2a7c2c3bda0a91cacf248727baf2a47961e Parents: bd79316 Author: sboikov Authored: Fri May 13 16:14:54 2016 +0300 Committer: sboikov Committed: Fri May 13 16:14:54 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/3319d2a7/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 2a29657..eb3d903 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 @@ -2516,14 +2516,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);