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 05A2D182A1 for ; Wed, 28 Oct 2015 13:15:39 +0000 (UTC) Received: (qmail 45859 invoked by uid 500); 28 Oct 2015 13:15:35 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 45701 invoked by uid 500); 28 Oct 2015 13:15:32 -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 42930 invoked by uid 99); 28 Oct 2015 13:14:40 -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, 28 Oct 2015 13:14:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 704D9E3909; Wed, 28 Oct 2015 13:14:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Wed, 28 Oct 2015 13:15:23 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] ignite git commit: IGNITE-426 Fixed tests. IGNITE-426 Fixed tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b59d02df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b59d02df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b59d02df Branch: refs/heads/ignite-426-2-reb Commit: b59d02dfd767f71fbb7ff6ca746584e8c80c3baa Parents: ef4a8ac Author: nikolay_tikhonov Authored: Fri Oct 23 13:36:37 2015 +0300 Committer: nikolay_tikhonov Committed: Wed Oct 28 15:24:36 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b59d02df/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 81b81e3..abed98d 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 @@ -1188,7 +1188,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } if (cctx.isLocal() || cctx.isReplicated() || - (!isNear() && !(tx != null && !tx.onePhaseCommit() && !tx.local()))) + (!isNear() && !(tx != null && tx.onePhaseCommit() && !tx.local()))) cctx.continuousQueries().onEntryUpdated(this, key, val, old, tx.local(), false, updateIdx0, topVer); cctx.dataStructures().onEntryUpdated(key, false); @@ -1364,7 +1364,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } if (cctx.isLocal() || cctx.isReplicated() || - (!isNear() && !(tx != null && !tx.onePhaseCommit() && !tx.local()))) + (!isNear() && !(tx != null && tx.onePhaseCommit() && !tx.local()))) cctx.continuousQueries().onEntryUpdated(this, key, null, old, tx.local(), false, updateIdx0, topVer); cctx.dataStructures().onEntryUpdated(key, true);