Simplify

2 files changed, 5 insertions, 10 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
index aa20f70f079..eb359f9ffc6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java
@@ -94,14 +94,10 @@ public abstract class Session implements Comparable<Session>  {
      * @return log preamble
      */
     public String logPre() {
-        Optional<ApplicationId> applicationId;
+        Optional<ApplicationId> applicationId = getOptionalApplicationId();
+
         // We might not be able to read application id from zookeeper
         // e.g. when the app has been deleted. Use tenant name in that case.
-        try {
-            applicationId = Optional.of(getApplicationId());
-        } catch (Exception e) {
-            applicationId = Optional.empty();
-        }
         return applicationId
                 .filter(appId -> ! appId.equals(ApplicationId.defaultId()))
                 .map(TenantRepository::logPre)
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 9c041775080..1af728919d9 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
@@ -526,7 +526,6 @@ public class SessionRepository {
     private ApplicationSet loadApplication(Session session, Optional<ApplicationSet> previousApplicationSet) {
         log.log(Level.FINE, () -> "Loading application for " + session);
         SessionZooKeeperClient sessionZooKeeperClient = createSessionZooKeeperClient(session.getSessionId());
-        ApplicationPackage applicationPackage = sessionZooKeeperClient.loadApplicationPackage();
         ActivatedModelsBuilder builder = new ActivatedModelsBuilder(session.getTenantName(),
                                                                     session.getSessionId(),
                                                                     sessionZooKeeperClient,
@@ -542,9 +541,9 @@ public class SessionRepository {
                                                                     modelFactoryRegistry,
                                                                     configDefinitionRepo);
         return ApplicationSet.fromList(builder.buildModels(session.getApplicationId(),
-                                                           sessionZooKeeperClient.readDockerImageRepository(),
-                                                           sessionZooKeeperClient.readVespaVersion(),
-                                                           applicationPackage,
+                                                           session.getDockerImageRepository(),
+                                                           session.getVespaVersion(),
+                                                           sessionZooKeeperClient.loadApplicationPackage(),
                                                            new AllocatedHostsFromAllModels(),
                                                            clock.instant()));
     }