ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [9/9] ignite git commit: IGNITE-1702 - Fixed rollback error.
Date Wed, 21 Oct 2015 08:10:12 GMT
IGNITE-1702 - Fixed rollback error.


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

Branch: refs/heads/ignite-1702
Commit: 95a19bb4cfd82766b548c09e40f0203cc5ca7101
Parents: f6755b5
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Wed Oct 21 11:09:50 2015 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Wed Oct 21 11:09:50 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtTxFinishFuture.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/95a19bb4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 177d5b7..bb811fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -222,7 +222,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
 
             Throwable e = this.err.get();
 
-            if (e == null)
+            if (e == null && commit)
                 e = this.tx.commitError();
 
             if (super.onDone(tx, e != null ? e : err)) {


Mime
View raw message