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 3C8AB1072A for ; Mon, 27 Apr 2015 11:12:30 +0000 (UTC) Received: (qmail 22456 invoked by uid 500); 27 Apr 2015 11:12:30 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 22425 invoked by uid 500); 27 Apr 2015 11:12:30 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 22416 invoked by uid 99); 27 Apr 2015 11:12:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 11:12:30 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Apr 2015 11:12:25 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 61A2C28347 for ; Mon, 27 Apr 2015 11:11:11 +0000 (UTC) Received: (qmail 19146 invoked by uid 99); 27 Apr 2015 11:11:11 -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, 27 Apr 2015 11:11:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F5E6E30F5; Mon, 27 Apr 2015 11:11:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 27 Apr 2015 11:11:23 -0000 Message-Id: <227e71fed0ab49e78fdba8d330514d95@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/50] incubator-ignite git commit: ignite-656: passing skipStore flag to higher API X-Virus-Checked: Checked by ClamAV on apache.org ignite-656: passing skipStore flag to higher API Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83c55558 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83c55558 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83c55558 Branch: refs/heads/ignite-800 Commit: 83c555586666f1536fd02125d2ab03a8d548045b Parents: 63c3230 Author: Denis Magda Authored: Tue Apr 21 16:26:01 2015 +0300 Committer: Denis Magda Committed: Tue Apr 21 16:26:01 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/colocated/GridDhtColocatedCache.java | 2 +- .../cache/distributed/near/GridNearTransactionalCache.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83c55558/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index cafd268..654e1ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -164,7 +164,7 @@ public class GridDhtColocatedCache extends GridDhtTransactionalCacheAdapte IgniteTxLocalAdapter tx = ctx.tm().threadLocalTx(ctx); - CacheOperationContext opCtx = ctx.operationContextPerCall(); + final CacheOperationContext opCtx = ctx.operationContextPerCall(); if (tx != null && !tx.implicit() && !skipTx) { return asyncOp(tx, new AsyncOp>(keys) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83c55558/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 00b18a4..ca292dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -115,7 +115,7 @@ public class GridNearTransactionalCache extends GridNearCacheAdapter CacheOperationContext opCtx = ctx.operationContextPerCall(); - boolean skipStore = opCtx != null && opCtx.skipStore(); + final boolean skipStore = opCtx != null && opCtx.skipStore(); if (tx != null && !tx.implicit() && !skipTx) { return asyncOp(tx, new AsyncOp>(keys) {