From 6d21d311008159419bcb99aa55a9490eb173621c Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Thu, 17 Aug 2023 10:50:34 +0200
Subject: Simplify

---
 .../main/java/com/yahoo/vespa/config/server/session/Session.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'configserver/src/main/java/com/yahoo/vespa/config/server/session/Session.java')

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)
-- 
cgit v1.2.3