ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject ignite git commit: IGNITE-1702 - Fixed failing tests.
Date Wed, 21 Oct 2015 13:01:20 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1702 95a19bb4c -> a45a788fc


IGNITE-1702 - Fixed failing tests.


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

Branch: refs/heads/ignite-1702
Commit: a45a788fc640f46983653bf217b7c4c24078085b
Parents: 95a19bb
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Wed Oct 21 16:01:06 2015 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Wed Oct 21 16:01:06 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/GridDhtTxFinishFuture.java        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a45a788f/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 bb811fa..fd995cf 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
@@ -225,9 +225,14 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
             if (e == null && commit)
                 e = this.tx.commitError();
 
-            if (super.onDone(tx, e != null ? e : err)) {
+            Throwable finishErr = e != null ? e : err;
+
+            if (super.onDone(tx, finishErr)) {
+                if (finishErr == null)
+                    finishErr = this.tx.commitError();
+
                 // Always send finish reply.
-                this.tx.sendFinishReply(commit, error());
+                this.tx.sendFinishReply(commit, finishErr);
 
                 // Don't forget to clean up.
                 cctx.mvcc().removeFuture(this);


Mime
View raw message