add some static/temporary logging to see what is going on

lucee · Oct 17, 2024 · 7fdd2f8 · 7fdd2f8
1 parent b66a4f2
commit 7fdd2f8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/main/java/lucee/runtime/listener/ModernAppListener.java b/core/src/main/java/lucee/runtime/listener/ModernAppListener.java
@@ -349,12 +349,17 @@ public void onSessionEnd(CFMLFactory factory, String applicationName, String cfi
 			if (scope instanceof JSession) app = ((JSession) scope).getComponent();
 			if (app == null || !app.containsKey(ON_SESSION_END)) return;
 			PageContextImpl pc = null;
+			PageContext existing = ThreadLocalPageContext.get();
 			try {
 				pc = createPageContext(factory, app, applicationName, cfid, ON_SESSION_END, true, -1);
+				ThreadLocalPageContext.register(pc);
 				call(app, pc, ON_SESSION_END, new Object[] { pc.sessionScope(false), pc.applicationScope() }, true);
 			}
 			finally {
-				if (pc != null) {
+				if (existing != null) {
+					ThreadLocalPageContext.register(pc);
+				}
+				else if (pc != null) {
 					factory.releaseLuceePageContext(pc, true);
 				}
 			}