Check existence inside lock

1 files changed, 2 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
index a4bab8302cb..68b1339a0a9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
@@ -77,9 +77,10 @@ public class ApplicationCuratorDatabase {
     public void createApplication(ApplicationId id, boolean writeAsJson) {
         if ( ! id.tenant().equals(tenant))
             throw new IllegalArgumentException("Cannot write application id '" + id + "' for tenant '" + tenant + "'");
-        if (curator.exists(applicationPath(id))) return;
 
         try (Lock lock = lock(id)) {
+            if (curator.exists(applicationPath(id))) return;
+
             if (writeAsJson) {
                 var applicationData = new ApplicationData(id, OptionalLong.empty(), OptionalLong.empty());
                 curator.set(applicationPath(id), applicationData.toJson());