Undertow - Session context lifecycle events should be observable from session scoped beans

extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/SessionContextTestCase.java

@@ -17,7 +17,8 @@ public class SessionContextTestCase {
 
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
-            .withApplicationRoot((jar) -> jar.addClasses(TestServlet.class, Foo.class, ObservingBean.class));
+            .withApplicationRoot(
+                    (jar) -> jar.addClasses(TestServlet.class, Foo.class, ObservingBean.class, SessionScopedObserver.class));
 
     @Test
     public void testServlet() {
@@ -38,12 +39,17 @@ public void testContextEvents() {
 
         // make sure we start with zero events to keep this test method independent
         observingBean.resetState();
+        SessionScopedObserver.resetState();
 
         // following request creates a session and also destroys it by enforcing invalidation
         when().get("/foo?destroy=true").then().statusCode(200);
         Assertions.assertEquals(1, observingBean.getTimesInitObserved());
         Assertions.assertEquals(1, observingBean.getTimesBeforeDestroyedObserved());
         Assertions.assertEquals(1, observingBean.getTimesDestroyedObserved());
+
+        // assert that @SessionScoped bean can observe init and before destroyed events as well
+        Assertions.assertEquals(1, SessionScopedObserver.timesInitObserved);
+        Assertions.assertEquals(1, SessionScopedObserver.timesBeforeDestroyedObserved);
     }
 
 }

extensions/undertow/deployment/src/test/java/io/quarkus/undertow/test/sessioncontext/SessionScopedObserver.java

@@ -0,0 +1,26 @@
+package io.quarkus.undertow.test.sessioncontext;
+
+import jakarta.enterprise.context.BeforeDestroyed;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Observes;
+
+@SessionScoped
+public class SessionScopedObserver {
+
+    static int timesInitObserved = 0;
+    static int timesBeforeDestroyedObserved = 0;
+
+    public void observeInit(@Observes @Initialized(SessionScoped.class) Object event) {
+        timesInitObserved++;
+    }
+
+    public void observeBeforeDestroyed(@Observes @BeforeDestroyed(SessionScoped.class) Object event) {
+        timesBeforeDestroyedObserved++;
+    }
+
+    public static void resetState() {
+        timesInitObserved = 0;
+        timesBeforeDestroyedObserved = 0;
+    }
+}

extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/HttpSessionContext.java

@@ -38,6 +38,7 @@ public class HttpSessionContext implements InjectableContext, HttpSessionListene
             + ".contextualInstances";
 
     private static final ThreadLocal<HttpSession> DESTRUCT_SESSION = new ThreadLocal<>();
+    private static final ThreadLocal<HttpSession> CREATED_SESSION = new ThreadLocal<>();
 
     private static final Logger LOG = Logger.getLogger(HttpSessionContext.class);
 
@@ -160,7 +161,10 @@ private ComputingCache<Key, ContextInstanceHandle<?>> getContextualInstances(Htt
     }
 
     private HttpSession session(boolean create) {
-        HttpSession session = null;
+        HttpSession session = CREATED_SESSION.get();
+        if (session != null) {
+            return session;
+        }
         try {
             session = ((HttpServletRequest) ServletRequestContext.requireCurrent().getServletRequest()).getSession(create);
         } catch (IllegalStateException ignored) {
@@ -213,6 +217,7 @@ public void sessionDestroyed(HttpSessionEvent se) {
         event.select(HttpSession.class, BeforeDestroyed.Literal.SESSION).fire(session);
         try {
             DESTRUCT_SESSION.set(session);
+            CREATED_SESSION.remove();
             destroy(session);
             event.select(HttpSession.class, Destroyed.Literal.SESSION).fire(session);
         } finally {
@@ -222,7 +227,9 @@ public void sessionDestroyed(HttpSessionEvent se) {
 
     @Override
     public void sessionCreated(HttpSessionEvent se) {
-        Arc.container().beanManager().getEvent().select(HttpSession.class, Initialized.Literal.SESSION).fire(se.getSession());
+        HttpSession createdSession = se.getSession();
+        CREATED_SESSION.set(createdSession);
+        Arc.container().beanManager().getEvent().select(HttpSession.class, Initialized.Literal.SESSION).fire(createdSession);
     }
 
 }