ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [2/2] ignite git commit: IGNITE-4242 ExchangeManager should wait for cache rebalancing in async way
Date Wed, 23 Nov 2016 12:03:46 GMT
IGNITE-4242 ExchangeManager should wait for cache rebalancing in async way


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

Branch: refs/heads/ignite-4242
Commit: cfe5ebf602bc0afc68c83b4a4327039a18269c74
Parents: 94e35ea
Author: Anton Vinogradov <av@apache.org>
Authored: Wed Nov 23 15:03:34 2016 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Wed Nov 23 15:03:34 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCachePartitionExchangeManager.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cfe5ebf6/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 c8b5322..c123774 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
@@ -1579,7 +1579,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
 
                                 rebFuts.add(cacheCtx.preloader().rebalanceFuture());
 
-                                r = cur;
+                                if (cur != null)
+                                    r = cur;
                             }
                         }
 


Mime
View raw message