This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 6a3e3fa64a Additional guards for a null Manager
6a3e3fa64a is described below
commit 6a3e3fa64a6ab317c97bd0c7de1c9fb5aab651d8
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 22 19:03:25 2026 +0100
Additional guards for a null Manager
---
java/org/apache/catalina/manager/HTMLManagerServlet.java | 7 ++++++-
java/org/apache/catalina/manager/ManagerServlet.java | 8 ++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java
b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index 620475db6f..571aae4e93 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -892,7 +892,12 @@ public class HTMLManagerServlet extends ManagerServlet {
smClient.getString("managerServlet.noContext",
Escape.htmlElementContent(cn.getDisplayName())));
}
Manager manager = ctxt.getManager();
- List<Session> sessions = new
ArrayList<>(Arrays.asList(manager.findSessions()));
+ List<Session> sessions;
+ if (manager == null) {
+ sessions = Collections.emptyList();
+ } else {
+ sessions = new ArrayList<>(Arrays.asList(manager.findSessions()));
+ }
if (manager instanceof DistributedManager && showProxySessions) {
// Add dummy proxy sessions
Set<String> sessionIds = ((DistributedManager)
manager).getSessionIdsFull();
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index 65cc87018a..6a735b2769 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -1052,8 +1052,12 @@ public class ManagerServlet extends HttpServlet
implements ContainerServlet {
}
List<String> parts;
if (context.getState().isAvailable()) {
- parts = Arrays.asList(displayPath, "running", "" +
context.getManager().findSessions().length,
- context.getDocBase());
+ int sessionCount = 0;
+ Manager manager = context.getManager();
+ if (manager != null) {
+ sessionCount = manager.findSessions().length;
+ }
+ parts = Arrays.asList(displayPath, "running", "" +
sessionCount, context.getDocBase());
} else {
parts = Arrays.asList(displayPath, "stopped", "0",
context.getDocBase());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
