From c5747dd198ff80a8c17167b20657850530f7eb9f Mon Sep 17 00:00:00 2001
From: Bauke Scholtz <balusc@gmail.com>
Date: Sat, 10 Feb 2024 12:30:46 -0400
Subject: [PATCH] Fallback in case there's no mutex attribute for whatever
 reason

---
 impl/src/main/java/com/sun/faces/context/SessionMap.java | 4 +++-
 1 file changed, 3 insertions(+), 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
index f6487bc0e2..d5ea75a3d8 100644
--- 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) {