Avoid NPE when getting application set for non-loaded session

2 files changed, 2 insertions, 3 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 95b29235e2f..e677d248630 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
@@ -661,8 +661,7 @@ public class SessionRepository {
     private Optional<ApplicationSet> getApplicationSet(long sessionId) {
         Optional<ApplicationSet> applicationSet = Optional.empty();
         try {
-            RemoteSession session = getRemoteSession(sessionId);
-            applicationSet = Optional.ofNullable(ensureApplicationLoaded(session));
+            applicationSet = Optional.ofNullable(getRemoteSession(sessionId)).map(this::ensureApplicationLoaded);
         } catch (IllegalArgumentException e) {
             // Do nothing if we have no currently active session
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index a3a03eb942d..4e6df1921b6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -202,7 +202,7 @@ public class DeploymentTrigger {
         return List.copyOf(jobs.keySet());
     }
 
-    /** retrigger job. If the job is already running, it will be canceled, and retrigger enqueued. */
+    /** Retrigger job. If the job is already running, it will be canceled, and retrigger enqueued. */
     public Optional<JobId> reTriggerOrAddToQueue(DeploymentId deployment) {
         JobType jobType = JobType.from(controller.system(), deployment.zoneId())
                 .orElseThrow(() -> new IllegalArgumentException(Text.format("No job to trigger for (system/zone): %s/%s", controller.system().value(), deployment.zoneId().value())));