Fallback in case there's no mutex attribute for whatever reason

eclipse-ee4j · Feb 10, 2024 · c5747dd · c5747dd
1 parent 5a23e8a
commit c5747dd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/impl/src/main/java/com/sun/faces/context/SessionMap.java b/impl/src/main/java/com/sun/faces/context/SessionMap.java
@@ -16,6 +16,8 @@
 
 package com.sun.faces.context;
 
+import static java.util.Optional.ofNullable;
+
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -201,7 +203,7 @@ public static void createMutex(HttpSession session) {
     }
 
     public static Object getMutex(Object session) {
-        return session instanceof HttpSession ? ((HttpSession) session).getAttribute(MUTEX) : session;
+        return session instanceof HttpSession httpSession ? ofNullable(httpSession.getAttribute(MUTEX)).orElse(session) : session;
     }
 
     public static void removeMutex(HttpSession session) {