Synchronise accesses to applicationSet in RemoteSession to avoid concurrent loading

1 files changed, 3 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
index c45513e3a07..8838daeb32e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/RemoteSession.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
 public class RemoteSession extends Session {
 
     private static final Logger log = Logger.getLogger(RemoteSession.class.getName());
-    private volatile ApplicationSet applicationSet = null;
+    private ApplicationSet applicationSet = null;
     private final ActivatedModelsBuilder applicationLoader;
     private final Clock clock;
 
@@ -69,7 +69,7 @@ public class RemoteSession extends Session {
                                                                      clock.instant()));
     }
 
-    public ApplicationSet ensureApplicationLoaded() {
+    public synchronized ApplicationSet ensureApplicationLoaded() {
         if (applicationSet == null) {
             applicationSet = loadApplication();
         }
@@ -80,7 +80,7 @@ public class RemoteSession extends Session {
         return zooKeeperClient.readStatus();
     }
 
-    public void deactivate() {
+    public synchronized void deactivate() {
         applicationSet = null;
     }