Merge pull request #8569 from vespa-engine/hakonhall/always-reset-updatepossiblyinprogress-on-leaving-scope

Always reset updatePossiblyInProgress on leaving scope

1 files changed, 6 insertions, 4 deletions

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelCache.java b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelCache.java
index 7a6f37b2c94..c50f5e6c2d5 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelCache.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/model/ServiceModelCache.java
@@ -46,10 +46,12 @@ public class ServiceModelCache implements Supplier<ServiceModel> {
                 updatePossiblyInProgress = true;
             }
 
-            takeSnapshot();
-
-            synchronized (updateMonitor) {
-                updatePossiblyInProgress = false;
+            try {
+                takeSnapshot();
+            } finally {
+                synchronized (updateMonitor) {
+                    updatePossiblyInProgress = false;
+                }
             }
         }