Move some method calls

2 files changed, 6 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 7bdeeaf74dc..0d696ca9015 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -441,6 +441,9 @@ public class SessionRepository {
 
     void activate(RemoteSession session) {
         long sessionId = session.getSessionId();
+        // Might need to create local session first
+        createLocalSessionFromDistributedApplicationPackage(sessionId);
+
         CompletionWaiter waiter = createSessionZooKeeperClient(sessionId).getActiveWaiter();
         log.log(Level.FINE, () -> session.logPre() + "Activating " + sessionId);
         applicationRepo.activateApplication(ensureApplicationLoaded(session), sessionId);
@@ -462,6 +465,9 @@ public class SessionRepository {
     }
 
     void prepareRemoteSession(RemoteSession session) {
+        // Might need to create local session first
+        createLocalSessionFromDistributedApplicationPackage(session.getSessionId());
+
         SessionZooKeeperClient sessionZooKeeperClient = createSessionZooKeeperClient(session.getSessionId());
         CompletionWaiter waiter = sessionZooKeeperClient.getPrepareWaiter();
         ensureApplicationLoaded(session);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
index 6c6f60426fe..e26d145d3d4 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
@@ -54,11 +54,9 @@ public class SessionStateWatcher {
                 sessionRepository.deactivateAndUpdateCache(session);
                 break;
             case PREPARE:
-                createLocalSession(sessionId);
                 sessionRepository.prepareRemoteSession(session);
                 break;
             case ACTIVATE:
-                createLocalSession(sessionId);
                 sessionRepository.activate(session);
                 break;
             case DEACTIVATE:
@@ -69,10 +67,6 @@ public class SessionStateWatcher {
         }
     }
 
-    private void createLocalSession(long sessionId) {
-        sessionRepository.createLocalSessionFromDistributedApplicationPackage(sessionId);
-    }
-
     public long getSessionId() {
         return session.getSessionId();
     }