You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/05 13:25:43 UTC
[07/14] ignite git commit: Minor + merge from master
Minor + merge from master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/36c55008
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/36c55008
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/36c55008
Branch: refs/heads/ignite-2329-1
Commit: 36c55008b355254e3944d7447bafa3078a51fe0d
Parents: f8a55ad
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri Jan 29 14:38:54 2016 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Jan 29 14:38:54 2016 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/36c55008/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index a72596c..0bff618 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -699,10 +699,12 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
*/
@SuppressWarnings( {"unchecked", "RedundantCast"})
@Override public GridDhtFuture<Object> request(Collection<KeyCacheObject> keys, AffinityTopologyVersion topVer) {
- if (cctx.rebalanceEnabled() &&
- rebalanceFuture().isDone() &&
- Boolean.TRUE.equals(rebalanceFuture().result()))
- return null;
+ if (cctx.rebalanceEnabled()) {
+ IgniteInternalFuture<Boolean> rebalanceFut = rebalanceFuture();
+
+ if (rebalanceFut.isDone() && Boolean.TRUE.equals(rebalanceFut.result()))
+ return null;
+ }
final GridDhtForceKeysFuture<?, ?> fut = new GridDhtForceKeysFuture<>(cctx, topVer, keys, this);