This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 574e48d282 Fix an additional potential NPE in Connector
574e48d282 is described below
commit 574e48d282ada31fc795b687644670042b08de8a
Author: Mark Thomas <[email protected]>
AuthorDate: Thu May 21 11:28:58 2026 +0100
Fix an additional potential NPE in Connector
---
java/org/apache/catalina/connector/Connector.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index e0cf32b87c..f7f6428865 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -1003,7 +1003,10 @@ public class Connector extends LifecycleMBeanBase {
* @return the executor name, or {@link #INTERNAL_EXECUTOR_NAME} if using
the internal executor
*/
public String getExecutorName() {
- Object obj = protocolHandler.getExecutor();
+ Object obj = null;
+ if (protocolHandler != null) {
+ obj = protocolHandler.getExecutor();
+ }
if (obj instanceof org.apache.catalina.Executor) {
return ((org.apache.catalina.Executor) obj).getName();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
