Repository: ignite Updated Branches: refs/heads/ignite-2.5 9e3daf6aa -> ee1e089a8
IGNITE-8323 Fixed discovery event listener calls - Fixes #3890. Signed-off-by: Alexey Goncharuk <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee1e089a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee1e089a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee1e089a Branch: refs/heads/ignite-2.5 Commit: ee1e089a8cded02e51063602cb8c470a2aad4fa7 Parents: 9e3daf6 Author: Ilya Lantukh <[email protected]> Authored: Mon Apr 23 17:39:57 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Apr 23 17:41:24 2018 +0300 ---------------------------------------------------------------------- .../internal/managers/discovery/GridDiscoveryManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee1e089a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 6af3293..e9b6cfe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -687,11 +687,15 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { } nextTopVer = new AffinityTopologyVersion(topVer, minorTopVer); + + if (incMinorTopVer) + ctx.cache().onDiscoveryEvent(type, customMsg, node, nextTopVer, ctx.state().clusterState()); } - else + else { nextTopVer = new AffinityTopologyVersion(topVer, minorTopVer); - ctx.cache().onDiscoveryEvent(type, customMsg, node, nextTopVer, ctx.state().clusterState()); + ctx.cache().onDiscoveryEvent(type, customMsg, node, nextTopVer, ctx.state().clusterState()); + } if (type == EVT_DISCOVERY_CUSTOM_EVT) { for (Class cls = customMsg.getClass(); cls != null; cls = cls.getSuperclass()) {
