Merge pull request #713 from jfclere/master

Fix for MODCLUSTER-790.
modcluster · Jul 19, 2023 · de8c5ec · de8c5ec
2 parents b79fc8d + 247b11a
commit de8c5ec
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/container/tomcat-10.0/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java b/container/tomcat-10.0/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java
@@ -138,6 +138,9 @@ public void removeRequestListener(ServletRequestListener requestListener) {
 
     @Override
     public int getActiveSessionCount() {
+        if (this.context.getManager() == null) {
+            return 0;
+        }
         return this.context.getManager().getActiveSessions();
     }
 

diff --git a/container/tomcat-10.1/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java b/container/tomcat-10.1/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java
@@ -138,6 +138,9 @@ public void removeRequestListener(ServletRequestListener requestListener) {
 
     @Override
     public int getActiveSessionCount() {
+        if (this.context.getManager() == null) {
+            return 0;
+        }
         return this.context.getManager().getActiveSessions();
     }
 

diff --git a/container/tomcat-8.5/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java b/container/tomcat-8.5/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java
@@ -138,6 +138,9 @@ public void removeRequestListener(ServletRequestListener requestListener) {
 
     @Override
     public int getActiveSessionCount() {
+        if (this.context.getManager() == null) {
+            return 0;
+        }
         return this.context.getManager().getActiveSessions();
     }
 

diff --git a/container/tomcat-9.0/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java b/container/tomcat-9.0/src/main/java/org/jboss/modcluster/container/tomcat/TomcatContext.java
@@ -138,6 +138,9 @@ public void removeRequestListener(ServletRequestListener requestListener) {
 
     @Override
     public int getActiveSessionCount() {
+        if (this.context.getManager() == null) {
+            return 0;
+        }
         return this.context.getManager().getActiveSessions();
     }