ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject ignite git commit: IGNITE-4242 ExchangeManager should wait for cache rebalancing in async way (compilation under 1.7 fix)
Date Mon, 21 Nov 2016 13:56:12 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4242 5536adfd8 -> e8d88b0a5


IGNITE-4242 ExchangeManager should wait for cache rebalancing in async way (compilation under
1.7 fix)


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

Branch: refs/heads/ignite-4242
Commit: e8d88b0a5f118c9135c0134fc97120687d746750
Parents: 5536adf
Author: Anton Vinogradov <av@apache.org>
Authored: Mon Nov 21 16:55:59 2016 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Mon Nov 21 16:55:59 2016 +0300

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


http://git-wip-us.apache.org/repos/asf/ignite/blob/e8d88b0a/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 eb9f1f7..e0d1143 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
@@ -1551,7 +1551,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
 
                             int order = cacheCtx.config().getRebalanceOrder();
 
-                            orderMap.putIfAbsent(order, new ArrayList<>(size));
+                            if (orderMap.get(order) == null)
+                                orderMap.put(order, new ArrayList<>(size));
 
                             orderMap.get(order).add(cacheId);
                         }


Mime
View raw message