diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2021-07-02 11:41:06 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2021-07-02 11:41:06 +0200 |
commit | acc65f896c5da48e14eddd7e43230d593ac304ff (patch) | |
tree | 3c6a5d4157323fb31a029d7d4844c52efe43f3ca /configserver/src | |
parent | 683b06daeb3cdfc62ca245f0601a0de8307ddce1 (diff) |
Avoid NPE when getting application set for non-loaded session
Diffstat (limited to 'configserver/src')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java | 3 |
1 files changed, 1 insertions, 2 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 } |