From f3c3397d99d81f94056a3fc217600e0d07f31b63 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 11 Feb 2020 06:21:47 +0000 Subject: Never null --- .../src/main/java/com/yahoo/search/cluster/ClusterMonitor.java | 2 +- .../java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'container-search') diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java index 55f0816514d..15cf4995b77 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java @@ -101,7 +101,7 @@ public class ClusterMonitor { Boolean wasWorking = monitor.isKnownWorking(); monitor.responded(); if (wasWorking != monitor.isKnownWorking()) - nodeManager.working(monitor.getNode()); + nodeManager.working(node); } /** diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java index d462479226a..d44ade66967 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java @@ -269,8 +269,6 @@ public class SearchCluster implements NodeManager { /** Used by the cluster monitor to manage node status */ @Override public void ping(ClusterMonitor clusterMonitor, Node node, Executor executor) { - if (pingFactory == null) return; // not initialized yet - Pinger pinger = pingFactory.createPinger(node, clusterMonitor, new PongCallback(node, clusterMonitor)); pinger.ping(); } -- cgit v1.2.3