Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7D4C918DE2 for ; Wed, 23 Sep 2015 01:36:31 +0000 (UTC) Received: (qmail 48523 invoked by uid 500); 23 Sep 2015 01:36:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 48437 invoked by uid 500); 23 Sep 2015 01:36:31 -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 47943 invoked by uid 99); 23 Sep 2015 01:36:31 -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; Wed, 23 Sep 2015 01:36:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06045E0663; Wed, 23 Sep 2015 01:36:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Wed, 23 Sep 2015 01:36:44 -0000 Message-Id: <4fa58675371f4eb7956e61e7a8a6be29@git.apache.org> In-Reply-To: <323bccd76c734f259f63595b3b69c644@git.apache.org> References: <323bccd76c734f259f63595b3b69c644@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/23] ignite git commit: Check for WeakValue in GridH2AbstractKeyValueRow.onUnswap Check for WeakValue in GridH2AbstractKeyValueRow.onUnswap Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca2bce00 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca2bce00 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca2bce00 Branch: refs/heads/ignite-1171 Commit: ca2bce00516142a1204fb9226c938174047e72d6 Parents: 72c3eef Author: sboikov Authored: Tue Sep 22 15:04:27 2015 +0300 Committer: sboikov Committed: Tue Sep 22 15:04:27 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/opt/GridH2AbstractKeyValueRow.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca2bce00/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index c11f541..ca5442a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -119,7 +119,9 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { * @throws IgniteCheckedException If failed. */ public synchronized void onUnswap(Object val, boolean beforeRmv) throws IgniteCheckedException { - if (peekValue(VAL_COL) != null) + Value val0 = peekValue(VAL_COL); + + if (val0 != null && !(val0 instanceof WeakValue)) return; setValue(VAL_COL, desc.wrap(val, desc.valueType()));