You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/05/21 04:11:46 UTC
[49/50] [abbrv] incubator-ignite git commit: IGNITE-80 - Merge branch
ignite-sprint-5 into ignite-80
IGNITE-80 - Merge branch ignite-sprint-5 into ignite-80
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6e85a11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6e85a11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6e85a11
Branch: refs/heads/ignite-80
Commit: a6e85a118c4e08c7c201e5920a70cdb8d2aa1a6f
Parents: 89d9835
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Wed May 20 17:26:13 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Wed May 20 17:26:13 2015 -0700
----------------------------------------------------------------------
.../distributed/near/GridNearPessimisticTxPrepareFuture.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6e85a11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index bce62c1..ab3fbe8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -135,7 +135,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
AffinityTopologyVersion topVer = tx.topologyVersion();
- txMapping = new GridDhtTxMapping();
+ txMapping = new GridDhtTxMapping(cctx.localNodeId());
for (IgniteTxEntry txEntry : tx.allEntries()) {
GridCacheContext cacheCtx = txEntry.context();
@@ -144,7 +144,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
ClusterNode primary = F.first(nodes);
- boolean near = cacheCtx.isNear();
+ boolean near = primary.isLocal() && cacheCtx.isNear();
IgniteBiTuple<ClusterNode, Boolean> key = F.t(primary, near);
@@ -162,7 +162,7 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
nodeMapping.add(txEntry);
- txMapping.addMapping(nodes);
+ txMapping.addMapping(nodes, near);
}
tx.transactionNodes(txMapping.transactionNodes());