You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/25 08:12:27 UTC
[3/3] ignite git commit: ignite-1.5
ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd86925b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd86925b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd86925b
Branch: refs/heads/ignite-1537
Commit: bd86925b155893b7c1730439479fdb9bec494f61
Parents: 441a039
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 25 10:08:16 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 25 10:08:16 2015 +0300
----------------------------------------------------------------------
.../near/GridNearOptimisticTxPrepareFutureAdapter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bd86925b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
index fe6180a..7132567 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
@@ -54,9 +54,13 @@ public abstract class GridNearOptimisticTxPrepareFutureAdapter extends GridNearT
AffinityTopologyVersion topVer = null;
- if (tx.system())
+ if (tx.system()) {
topVer = tx.topologyVersionSnapshot();
+ if (topVer == null)
+ topVer = cctx.exchange().readyAffinityVersion();
+ }
+
if (topVer == null)
topVer = cctx.mvcc().lastExplicitLockTopologyVersion(threadId);