Repository: ignite Updated Branches: refs/heads/ignite-5578 7821eba48 -> 8f6be3bc8
5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5631a5a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5631a5a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5631a5a Branch: refs/heads/ignite-5578 Commit: d5631a5a96deb98a9420824b249b7afe2688a414 Parents: 7821eba Author: sboikov <[email protected]> Authored: Tue Aug 1 10:45:40 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Aug 1 10:45:40 2017 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +- .../cache/NonAffinityCoordinatorDynamicStartStopTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d5631a5a/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 56c6fd6..1601f2b 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 @@ -735,7 +735,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte boolean updateTop = exchId.topologyVersion().equals(grp.localStartVersion()); if (updateTop && clientTop != null) { - top.update(initialVersion(), + top.update(null, clientTop.partitionMap(true), clientTop.updateCounters(false), Collections.<Integer>emptySet(), http://git-wip-us.apache.org/repos/asf/ignite/blob/d5631a5a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java index a4733d5..d065941 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java @@ -117,7 +117,7 @@ public class NonAffinityCoordinatorDynamicStartStopTest extends GridCommonAbstra cache.destroy(); - grid("dummy").createCache(CCFG); + grid(DUMMY_GRID_NAME).createCache(CCFG); } /** {@inheritDoc} */
