ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1.8 debug
Date Fri, 02 Dec 2016 12:00:23 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.8-drop2 [created] 8b24a43d5


ignite-1.8 debug


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

Branch: refs/heads/ignite-1.8-drop2
Commit: 8b24a43d5cc384bf35528acb371049f49898a650
Parents: 445cde7
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 2 15:00:17 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 2 15:00:17 2016 +0300

----------------------------------------------------------------------
 .../distributed/near/GridNearOptimisticTxPrepareFuture.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8b24a43d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 87c9e1d..de5327f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -598,11 +598,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
         GridCacheEntryEx cached0 = entry.cached();
 
         if (cached0.isDht())
-            nodes = cacheCtx.topology().nodes(cached0.partition(), topVer);
+            nodes = cacheCtx.affinity().nodes(cached0.partition(), topVer);
         else
-            nodes = cacheCtx.isLocal() ?
-                cacheCtx.affinity().nodes(entry.key(), topVer) :
-                cacheCtx.topology().nodes(cacheCtx.affinity().partition(entry.key()), topVer);
+            nodes = cacheCtx.affinity().nodes(entry.key(), topVer);
 
         txMapping.addMapping(nodes);
 


Mime
View raw message