[isis] branch master updated: ISIS-3174: fixes potential NPE on Wicket Session Recovery

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c678a7dc5 ISIS-3174: fixes potential NPE on Wicket Session Recovery
6c678a7dc5 is described below

commit 6c678a7dc5c1f3f62dfe9374dbc385ea12950172
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Aug 24 18:36:37 2022 +0200

    ISIS-3174: fixes potential NPE on Wicket Session Recovery
---
 .../integration/AuthenticatedWebSessionForIsis.java       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
 
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 3380fe445a..e23eb59ae8 100644
--- 
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ 
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -18,6 +18,7 @@
  */
 package org.apache.isis.viewer.wicket.viewer.integration;
 
+import java.util.Optional;
 import java.util.UUID;
 import java.util.function.UnaryOperator;
 
@@ -216,11 +217,15 @@ implements
         if (!isSignedIn()) {
             return null;
         }
-
-        final Roles roles = new Roles();
-        getAuthentication().getUser().streamRoleNames()
-        .forEach(roles::add);
-        return roles;
+        return Optional.ofNullable(getAuthentication())
+            .map(InteractionContext::getUser)
+            .map(user->{
+                val roles = new Roles();
+                user.streamRoleNames()
+                .forEach(roles::add);
+                return roles;
+            })
+            .orElse(null);
     }
 
     @Override