ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [43/49] incubator-ignite git commit: Ignite-9655-merge - Fixing tests.
Date Sun, 15 Feb 2015 08:19:03 GMT
Ignite-9655-merge - Fixing tests.


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

Branch: refs/heads/sprint-1
Commit: 911f33741b53ff0d250bfa86b386f7d88ca4111a
Parents: 16c3cce
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Sat Feb 14 21:01:06 2015 -0800
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Sat Feb 14 21:01:06 2015 -0800

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtTxPrepareFuture.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/911f3374/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index bcecc96..237c2a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -595,12 +595,12 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
             res.completedVersions(cctx.tm().committedVersions(min), cctx.tm().rolledbackVersions(min));
 
             res.pending(localDhtPendingVersions(tx.writeEntries(), min));
+
+            tx.implicitSingleResult(ret);
         }
 
         res.filterFailedKeys(filterFailedKeys);
 
-        tx.implicitSingleResult(ret);
-
         return res;
     }
 


Mime
View raw message