# IGNITE-709 Remove unnecessary null checking
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a73b5ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a73b5ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a73b5ad Branch: refs/heads/ignite-929 Commit: 6a73b5ade2ef006a44c1f7c936fc3e13776d69f3 Parents: 8fbb590 Author: sevdokimov <sergey.evdoki...@jetbrains.com> Authored: Sun May 24 21:17:04 2015 +0300 Committer: sevdokimov <sergey.evdoki...@jetbrains.com> Committed: Sun May 24 21:17:04 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a73b5ad/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 62548d8..b60c753 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 @@ -361,7 +361,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { if (type == EVT_NODE_METRICS_UPDATED) verChanged = false; else if (type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT) { - if (customMsg != null && customMsg.incrementMinorTopologyVersion()) { + assert customMsg != null; + + if (customMsg.incrementMinorTopologyVersion()) { minorTopVer++; verChanged = true; @@ -385,18 +387,16 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { } if (type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT) { - if (customMsg != null) { - for (Class cls = customMsg.getClass(); cls != null; cls = cls.getSuperclass()) { - List<CustomEventListener<DiscoveryCustomMessage>> list = customEvtLsnrs.get(cls); - - if (list != null) { - for (CustomEventListener<DiscoveryCustomMessage> lsnr : list) { - try { - lsnr.onCustomEvent(node, customMsg); - } - catch (Exception e) { - U.error(log, "Failed to notify direct custom event listener: " + customMsg, e); - } + for (Class cls = customMsg.getClass(); cls != null; cls = cls.getSuperclass()) { + List<CustomEventListener<DiscoveryCustomMessage>> list = customEvtLsnrs.get(cls); + + if (list != null) { + for (CustomEventListener<DiscoveryCustomMessage> lsnr : list) { + try { + lsnr.onCustomEvent(node, customMsg); + } + catch (Exception e) { + U.error(log, "Failed to notify direct custom event listener: " + customMsg, e); } } }
