diff --git a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java index a58b41b..a67f742 100644 --- a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java +++ b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java @@ -71,10 +71,15 @@ public class SmartGearsPortalValve extends ValveBase { _log.debug("Getting current user"); User user = getCurrentUser(request); + // user cannot be null otherwise also the getCurrentUsername(request) returned null username in previous lines _log.debug("Getting current session"); HttpSession session = request.getSession(false); - OIDCUmaUtil.checkUMATicketAndProvideInThreadLocal(request, (HttpServletResponse) resp, user, - session, scope); + if (session != null) { + OIDCUmaUtil.checkUMATicketAndProvideInThreadLocal(request, (HttpServletResponse) resp, user, + session, scope); + } else { + _log.debug("Session is null, cannot continue"); + } //_log.trace("Security token set OK for " + username + " in scope " + scope); }