# 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-sprint-5 Commit: 42563f6c1b0f57e6a087c819df26893df5510ae9 Parents: 3394b4c Author: sboikov <sboi...@gridgain.com> Authored: Tue May 5 16:06:52 2015 +0300 Committer: sboikov <sboi...@gridgain.com> 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<IgniteInternalTx> 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);
