ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [26/50] [abbrv] ignite git commit: IGNITE-6181 wip.
Date Tue, 19 Sep 2017 14:45:52 GMT
IGNITE-6181 wip.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ab36ce2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ab36ce2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ab36ce2

Branch: refs/heads/ignite-6181-1
Commit: 8ab36ce2ba4219fcf9d5272d999267878c0e20a5
Parents: 685e69a
Author: ascherbakoff <alexey.scherbakoff@gmail.com>
Authored: Thu Sep 7 19:53:58 2017 +0300
Committer: ascherbakoff <alexey.scherbakoff@gmail.com>
Committed: Thu Sep 7 19:53:58 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/distributed/near/GridNearTxLocal.java     | 6 +++---
 .../processors/cache/transactions/TxRollbackOnTimeoutTest.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8ab36ce2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 965a502..0c76aec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -3256,9 +3256,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements
GridTimeou
      * @throws IgniteCheckedException If failed.
      */
     public void rollback() throws IgniteCheckedException {
-        if (timeout() > 0)
-            cctx.time().removeTimeoutObject(this);
-
         rollbackNearTxLocalAsync().get();
     }
 
@@ -3269,6 +3266,9 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements
GridTimeou
         if (log.isDebugEnabled())
             log.debug("Rolling back near tx: " + this);
 
+        if (remainingTime() > 0)
+            cctx.time().removeTimeoutObject(this);
+
         if (fastFinish()) {
             state(PREPARING);
             state(PREPARED);

http://git-wip-us.apache.org/repos/asf/ignite/blob/8ab36ce2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
index 4799534..d854cf0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java
@@ -60,7 +60,7 @@ public class TxRollbackOnTimeoutTest extends GridCommonAbstractTest {
     private final CountDownLatch blocked = new CountDownLatch(1);
 
     /** */
-    private CountDownLatch unblocked = new CountDownLatch(1);
+    private final CountDownLatch unblocked = new CountDownLatch(1);
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws
Exception {


Mime
View raw message