ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [26/36] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Date Fri, 08 Sep 2017 12:35:58 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java


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

Branch: refs/heads/ignite-6149
Commit: dcaf8801accd6ee089849a82b2ccd558aec81895
Parents: 27b87b4
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Sep 6 11:19:30 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Sep 6 11:19:30 2017 +0300

----------------------------------------------------------------------
 .../distributed/dht/GridDhtTxPrepareFuture.java  | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/dcaf8801/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 5ac86da..3bb4ea8 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
@@ -1263,19 +1263,8 @@ public final class GridDhtTxPrepareFuture extends GridCacheCompoundFuture<Ignite
             if (isDone())
                 return;
 
-            if (last)
-                sendPrepareRequests();
-        }
-        finally {
-            markInitialized();
-        }
-    }
-
-    /**
-     *
-     */
-    private void sendPrepareRequests() {
-        if (waitCrdCntrFut != null) {
+            if (last) {
+                if (waitCrdCntrFut != null) {
                     skipInit = true;
 
                     waitCrdCntrFut.listen(new IgniteInClosure<IgniteInternalFuture<Long>>()
{
@@ -1322,7 +1311,9 @@ public final class GridDhtTxPrepareFuture extends GridCacheCompoundFuture<Ignite
             }
         }
 
-                assert !tx.txState().mvccEnabled(cctx) || !tx.onePhaseCommit() || tx.mvccCoordinatorCounter()
!= TxMvccVersion.COUNTER_NA;int miniId = 0;
+        assert !tx.txState().mvccEnabled(cctx) || !tx.onePhaseCommit() || tx.mvccCoordinatorCounter()
!= TxMvccVersion.COUNTER_NA;
+
+        int miniId = 0;
 
         assert tx.transactionNodes() != null;
 


Mime
View raw message