Merge pull request #8609 from vespa-engine/jvenstad/fix-config-model-inconsitency

Jvenstad/fix config model inconsitency

2 files changed, 1 insertions, 6 deletions

diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml
index c6504ff9315..0826826f433 100644
--- a/service-monitor/pom.xml
+++ b/service-monitor/pom.xml
@@ -130,6 +130,7 @@
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
                         <arg>-Xlint:-serial</arg>
+                        <arg>-Xlint:-try</arg>
                         <arg>-Werror</arg>
                     </compilerArgs>
                 </configuration>
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java
index dbcc6ff7b9b..c6947810fa0 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelProvider.java
@@ -38,11 +38,6 @@ public class ServiceModelProvider implements Supplier<ServiceModel> {
     @Override
     public ServiceModel get() {
         try (LatencyMeasurement measurement = metrics.startServiceModelSnapshotLatencyMeasurement()) {
-            // Reference 'measurement' in a dummy statement, otherwise the compiler
-            // complains about "auto-closeable resource is never referenced in body of
-            // corresponding try statement". Why hasn't javac fixed this!?
-            dummy(measurement);
-
             // WARNING: The monitor manager may be out-of-sync with duper model (no locking)
             List<ApplicationInfo> applicationInfos = duperModelManager.getApplicationInfos();
 
@@ -50,5 +45,4 @@ public class ServiceModelProvider implements Supplier<ServiceModel> {
         }
     }
 
-    private void dummy(LatencyMeasurement measurement) {}
 }