ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [5/6] ignite git commit: ignite-1093
Date Mon, 31 Aug 2015 14:26:55 GMT
ignite-1093


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

Branch: refs/heads/ignite-1093-2
Commit: 765e2cfbd6955996364da8b3320b64b82898daf5
Parents: 9d5718f
Author: Anton Vinogradov <av@apache.org>
Authored: Mon Aug 31 16:49:24 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Mon Aug 31 16:49:24 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCachePartitionExchangeManager.java       | 1 -
 .../cache/distributed/dht/preloader/GridDhtPartitionDemander.java | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/765e2cfb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index bf77d1e..be24022 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -286,7 +286,6 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
                             return;
 
                         try {
-
                             cctx.cacheContext(m.cacheId).preloader().handleSupplyMessage(idx,
id, m);
                         }
                         finally {

http://git-wip-us.apache.org/repos/asf/ignite/blob/765e2cfb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 4fe2153..2d73c19 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -475,6 +475,9 @@ public class GridDhtPartitionDemander {
 
         final SyncFuture fut = syncFut;
 
+        if (!fut.topologyVersion().equals(topVer))
+            return;
+
         if (topologyChanged(topVer)) {
             fut.onCancel();
 


Mime
View raw message