You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/28 11:11:57 UTC
ignite git commit: ignite-1.5 debug
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 94218a818 -> 32665771b
ignite-1.5 debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32665771
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32665771
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32665771
Branch: refs/heads/ignite-1537
Commit: 32665771b98d73137cf9b7f2d31e731181df2662
Parents: 94218a8
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 28 13:11:50 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 28 13:11:50 2015 +0300
----------------------------------------------------------------------
.../processors/cache/distributed/dht/GridDhtTxLocal.java | 1 +
.../ignite/testsuites/IgniteCacheFailoverTestSuite3.java | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32665771/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index f344d48..a6a224b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -416,6 +416,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
if (!state(PREPARING)) {
if (state() == PREPARED && isSystemInvalidate())
fut.complete();
+
if (setRollbackOnly()) {
if (timedOut())
fut.onError(new IgniteTxTimeoutCheckedException("Transaction timed out and was rolled back: " +
http://git-wip-us.apache.org/repos/asf/ignite/blob/32665771/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
index 85b6e93..b490983 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
@@ -34,10 +34,11 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite {
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Cache Failover Test Suite3");
- suite.addTestSuite(IgniteCachePutRetryAtomicSelfTest.class);
- suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class);
suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
- suite.addTestSuite(CacheGetInsideLockChangingTopologyTest.class);
+ suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
+ suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
+ suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
+ suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
return suite;
}