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/05/27 16:48:56 UTC
[05/38] incubator-ignite git commit: # ignite-23
# ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/632a01ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/632a01ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/632a01ab
Branch: refs/heads/ignite-709_2
Commit: 632a01abe99ab9de6324e7c004c97476352a20af
Parents: 72d6ea5
Author: sboikov <se...@inria.fr>
Authored: Tue May 19 22:14:59 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Tue May 19 22:14:59 2015 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/632a01ab/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 102176e..94ca540 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1224,12 +1224,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
boolean set = false;
- for (Iterator<ClusterNode> it = rmtNodes.iterator(); it.hasNext(); ) {
- if (it.next().id().equals(nodeId))
- it.remove();
- }
-
- ClusterNode newOldest = CU.oldest(rmtNodes);
+ ClusterNode newOldest = CU.oldestAliveCacheServerNode(cctx, exchId.topologyVersion());
if (newOldest != null) {
// If local node is now oldest.