Repository: ignite Updated Branches: refs/heads/ignite-gg-12306-1 225f7157d -> 8de27e06f
12306 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8de27e06 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8de27e06 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8de27e06 Branch: refs/heads/ignite-gg-12306-1 Commit: 8de27e06f07dc6fa4405c87fd745295404a4d3a8 Parents: 225f715 Author: sboikov <[email protected]> Authored: Thu Jul 6 16:05:10 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Jul 6 16:05:10 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtTxFinishFuture.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8de27e06/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 d8180b4..775757c 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,7 +225,10 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCacheCompoundIdentity if (this.tx.onePhaseCommit() && (this.tx.state() == COMMITTING)) { try { - this.tx.tmFinish(err == null); + boolean nodeStop = err != null && X.hasCause(err, NodeStoppingException.class); + + if (!nodeStop) + this.tx.tmFinish(err == null); } catch (IgniteCheckedException finishErr) { U.error(log, "Failed to finish tx: " + tx, e);
