ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 12306
Date Thu, 06 Jul 2017 13:03:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-12306-1 5a85d9ec2 -> 225f7157d


12306


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

Branch: refs/heads/ignite-gg-12306-1
Commit: 225f7157dbfe3d8fb6bb8153dbfb326644a13bb8
Parents: 5a85d9e
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jul 6 16:03:39 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jul 6 16:03:39 2017 +0300

----------------------------------------------------------------------
 .../distributed/near/GridNearTxFinishFuture.java | 19 ++++++++++---------
 .../cache/transactions/IgniteTxAdapter.java      |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/225f7157/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 7f6f793..48e86c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -323,22 +323,23 @@ public final class GridNearTxFinishFuture<K, V> extends GridCacheCompoundIdentit
                 if (tx.onePhaseCommit()) {
                     boolean commit = this.commit && err == null;
 
-                    if (!nodeStop)
+                    if (!nodeStop) {
                         finishOnePhase(commit);
 
-                    try {
-                        tx.tmFinish(commit);
-                    }
-                    catch (IgniteCheckedException e) {
-                        U.error(log, "Failed to finish tx: " + tx, e);
+                        try {
+                            tx.tmFinish(commit);
+                        }
+                        catch (IgniteCheckedException e) {
+                            U.error(log, "Failed to finish tx: " + tx, e);
 
-                        if (err == null)
-                            err = e;
+                            if (err == null)
+                                err = e;
+                        }
                     }
                 }
 
                 if (super.onDone(tx0, err)) {
-                    if (error() instanceof IgniteTxHeuristicCheckedException) {
+                    if (error() instanceof IgniteTxHeuristicCheckedException && !nodeStop)
{
                         AffinityTopologyVersion topVer = tx.topologyVersion();
 
                         for (IgniteTxEntry e : tx.writeMap().values()) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/225f7157/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 5cfde98..927f3f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -433,9 +433,9 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter
implement
                         break;
                     }
                 }
-            }
 
-            cctx.tm().uncommitTx(this);
+                cctx.tm().uncommitTx(this);
+            }
         }
         catch (Exception ex) {
             U.error(log, "Failed to do uncommit.", ex);


Mime
View raw message