ignite-5272 tx
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e6fcaa57 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e6fcaa57 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e6fcaa57 Branch: refs/heads/ignite-5272-tx Commit: e6fcaa57277cc1d9ca5e3521c24be6b62484b9a4 Parents: 8b68721 Author: sboikov <[email protected]> Authored: Fri Jun 9 12:55:01 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Jun 9 12:55:01 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearTxFinishFuture.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e6fcaa57/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 89874ab..27cebf8 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 @@ -608,10 +608,19 @@ public final class GridNearTxFinishFuture<K, V> extends GridCacheCompoundIdentit * @return {@code True} if need to send finish request for one phase commit transaction. */ private boolean needFinishOnePhase(boolean commit) { + assert tx.onePhaseCommit(); + if (tx.mappings().empty()) return false; - return tx.txState().hasNearCache(cctx) || !commit; + if (!commit) + return true; + + GridDistributedTxMapping mapping = tx.mappings().singleMapping(); + + assert mapping != null; + + return mapping.hasNearCacheEntries(); } /**
