Fix ToDos. The snapshotProvider is null checked in the ctor.

2 files changed, 2 insertions, 12 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
index 6f6bab01ab5..ff73fcd3b4e 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
@@ -146,12 +146,7 @@ public class MetricsPacketsHandler extends AbstractRequestHandler {
     }
 
     private MetricSnapshot getSnapshot() {
-        if (snapshotProvider == null) {
-            // TODO: throw exception in ctor instead
-            return new MetricSnapshot(0L, 0L, TimeUnit.MILLISECONDS);
-        } else {
-            return snapshotProvider.latestSnapshot();
-        }
+        return snapshotProvider.latestSnapshot();
     }
 
     private List<JsonNode> getPacketsForSnapshot(MetricSnapshot metricSnapshot, String application, long timestamp) {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
index 8f0c661ed98..0dd284e21cf 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateHandler.java
@@ -206,12 +206,7 @@ public class StateHandler extends AbstractRequestHandler {
     }
 
     private MetricSnapshot getSnapshot() {
-        if (snapshotProvider == null) {
-            // TODO: throw exception in ctor instead
-            return new MetricSnapshot(0L, 0L, TimeUnit.MILLISECONDS);
-        } else {
-            return snapshotProvider.latestSnapshot();
-        }
+        return snapshotProvider.latestSnapshot();
     }
 
     private StateMonitor.Status getStatus() {