Merge pull request #16613 from vespa-engine/bratseth/lock-first

Lock first

1 files changed, 7 insertions, 1 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationPatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationPatcher.java
index 4e89d839a6a..035141356b9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationPatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationPatcher.java
@@ -33,8 +33,14 @@ public class ApplicationPatcher implements AutoCloseable {
         } catch (IOException e) {
             throw new UncheckedIOException("Error reading request body", e);
         }
-        this.application = nodeRepository.applications().require(applicationId);
         this.lock = nodeRepository.nodes().lock(applicationId);
+        try {
+            this.application = nodeRepository.applications().require(applicationId);
+        }
+        catch (RuntimeException e) {
+            lock.close();
+            throw e;
+        }
     }
 
     /** Applies the json to the application and returns it. */