You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/10/04 16:03:16 UTC
[08/50] [abbrv] ignite git commit: IGNITE-9501 Backward compatibility
fix - Fixes #4860.
IGNITE-9501 Backward compatibility fix - Fixes #4860.
Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5f6e50e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5f6e50e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5f6e50e
Branch: refs/heads/ignite-5797
Commit: d5f6e50edaa1dfd27d9a6f2a3bbcdacaf26057cd
Parents: 609266f
Author: Pavel Kovalenko <jo...@gmail.com>
Authored: Fri Sep 28 12:06:52 2018 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Fri Sep 28 12:06:52 2018 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5f6e50e/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 4e76f99..f43afa0 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
@@ -1508,7 +1508,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
releaseLatch.countDown();
// For compatibility with old version where joining nodes are not waiting for latch.
- if (!cctx.exchange().latch().canSkipJoiningNodes(initialVersion()))
+ if (localJoinExchange() && !cctx.exchange().latch().canSkipJoiningNodes(initialVersion()))
return;
try {
@@ -2543,7 +2543,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
}
}
-
if (allReceived) {
if (!awaitSingleMapUpdates())
return;