This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new feb77a1584 Fix possible NPE
feb77a1584 is described below
commit feb77a15849389001ebcfdd623df86a42a62019e
Author: remm <[email protected]>
AuthorDate: Fri Sep 8 16:00:03 2023 +0200
Fix possible NPE
Found by coverity.
---
java/org/apache/catalina/mbeans/ServiceMBean.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/mbeans/ServiceMBean.java
b/java/org/apache/catalina/mbeans/ServiceMBean.java
index 02c6db901c..36102f77bf 100644
--- a/java/org/apache/catalina/mbeans/ServiceMBean.java
+++ b/java/org/apache/catalina/mbeans/ServiceMBean.java
@@ -112,6 +112,10 @@ public class ServiceMBean extends
BaseCatalinaMBean<Service> {
public String getExecutor(String name) throws MBeanException{
Service service = doGetManagedResource();
Executor executor = service.getExecutor(name);
- return executor.toString();
+ if (executor != null) {
+ return executor.toString();
+ } else {
+ return null;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
