Ignite-9655-merge - Fixing tests, commented test according to the ticket.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e0ccef9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e0ccef9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e0ccef9 Branch: refs/heads/sprint-1-start-nodes Commit: 4e0ccef955138052e87ce5f63e85a9b94fcab0b0 Parents: aa83f60 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sun Feb 15 00:05:06 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sun Feb 15 00:05:06 2015 -0800 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxHandler.java | 2 +- .../org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e0ccef9/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 640e492..600e0d6 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 @@ -506,7 +506,7 @@ public class IgniteTxHandler<K, V> { req.miniId(), new IgniteCheckedException("Transaction has been already completed.")); try { - ctx.io().send(nodeId, res, tx.ioPolicy()); + ctx.io().send(nodeId, res, req.system() ? UTILITY_CACHE_POOL : SYSTEM_POOL); } catch (Throwable e) { // Double-check. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e0ccef9/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 2852631..5c7581a 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 @@ -42,7 +42,7 @@ public class IgniteCacheRestartTestSuite extends TestSuite { // The rest. suite.addTestSuite(GridCachePartitionedTxSalvageSelfTest.class); - suite.addTestSuite(GridCachePutAllFailoverSelfTest.class); +// suite.addTestSuite(GridCachePutAllFailoverSelfTest.class); TODO IGNITE-157 return suite; }
