ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [35/50] [abbrv] ignite git commit: IGNITE-264 - Use near version to track committed remote transactions.
Date Thu, 03 Sep 2015 01:03:44 GMT
IGNITE-264 - Use near version to track committed remote transactions.


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

Branch: refs/heads/ignite-264
Commit: cc988021ee70fd87eb22c23ef9e588a954e161cc
Parents: 1cd1eb3
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Tue Aug 25 19:27:37 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Tue Aug 25 19:27:37 2015 -0700

----------------------------------------------------------------------
 .../processors/cache/transactions/IgniteTxManager.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cc988021/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index cc86e6d..4554c6f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1021,7 +1021,12 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter
{
      * @return If transaction was not already present in committed set.
      */
     public boolean addCommittedTx(IgniteInternalTx tx) {
-        return addCommittedTx(tx.xidVersion(), tx.nearXidVersion());
+        boolean res = addCommittedTx(tx.xidVersion(), tx.nearXidVersion());
+
+        if (!tx.local() && tx.onePhaseCommit())
+            addCommittedTx(tx.nearXidVersion(), null);
+
+        return res;
     }
 
     /**


Mime
View raw message