Merge pull request #6749 from flowlogix/fix-dangling-session-thread

Properly cleaning up ContainerBackgroundSessionProcessor threads after application is undeployed
payara · Jun 12, 2024 · b54bf99 · b54bf99
2 parents 54c4687 + 137ac9b
commit b54bf99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ContainerBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ContainerBase.java
@@ -1750,7 +1750,7 @@ protected void threadStart() {
      * to update lastaccesstime and accessedTime.
      */
     protected void threadSessionStart() {
-        if (sessionThread != null)
+        if (sessionThread != null || manager == null)
             return;
         threadSessionDone = false;
         String threadName = "ContainerBackgroundSessionProcessor[" + toString() + "]";

diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java
@@ -5946,6 +5946,8 @@ public synchronized void stop(boolean isShutdown)
 
             // Stop ContainerBackgroundProcessor thread
             super.threadStop();
+            // Stop ContainerBackgroundSessionProcessor thread
+            super.threadSessionStop();
 
             if ((manager != null) && (manager instanceof Lifecycle)) {
                 if(manager instanceof StandardManager) {