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 D88901090B for ; Tue, 5 May 2015 14:54:45 +0000 (UTC) Received: (qmail 42309 invoked by uid 500); 5 May 2015 14:54:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 42278 invoked by uid 500); 5 May 2015 14:54:45 -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 42269 invoked by uid 99); 5 May 2015 14:54:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 14:54:45 +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: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 May 2015 14:54:40 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 3F68843C83 for ; Tue, 5 May 2015 14:54:20 +0000 (UTC) Received: (qmail 38777 invoked by uid 99); 5 May 2015 14:54:19 -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; Tue, 05 May 2015 14:54:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB32FE10A1; Tue, 5 May 2015 14:54:19 +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 Message-Id: <76c9c7111a2540be9e6b0621ac0dd309@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: # ignite-157-2 Date: Tue, 5 May 2015 14:54:19 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-157-2 3394b4c5a -> 42563f6c1 # ignite-157-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/42563f6c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42563f6c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42563f6c Branch: refs/heads/ignite-157-2 Commit: 42563f6c1b0f57e6a087c819df26893df5510ae9 Parents: 3394b4c Author: sboikov Authored: Tue May 5 16:06:52 2015 +0300 Committer: sboikov Committed: Tue May 5 17:53:56 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxHandler.java | 5 +++++ .../apache/ignite/testsuites/IgniteCacheRestartTestSuite.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42563f6c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index 6843075..2897e30 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -53,6 +53,11 @@ public class IgniteTxHandler { /** Shared cache context. */ private GridCacheSharedContext ctx; + /** + * @param nearNodeId Node ID. + * @param req Request. + * @return Prepare future. + */ public IgniteInternalFuture processNearTxPrepareRequest(final UUID nearNodeId, final GridNearTxPrepareRequest req) { return prepareTx(nearNodeId, null, req, null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42563f6c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java index b219f7f..d620731 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java @@ -35,8 +35,8 @@ public class IgniteCacheRestartTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedTxSalvageSelfTest.class); - suite.addTestSuite(GridCachePartitionedNodeRestartTest.class); // TODO: IGNITE-157. + // suite.addTestSuite(GridCachePartitionedNodeRestartTest.class); // suite.addTestSuite(GridCachePartitionedOptimisticTxNodeRestartTest.class); // suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class);