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 41f183bcca Align with 12.0.x
41f183bcca is described below
commit 41f183bccacad1fa9a79e8c2dfb312057d697c44
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 3 12:23:00 2026 +0100
Align with 12.0.x
---
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index 46320ca617..d25f808815 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -470,7 +470,9 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
// that no message parts will be returned. If this is the case the
// trigger the supplied SendHandler
if (messageParts.isEmpty()) {
- handler.onResult(new SendResult(getSession()));
+ if (handler != null) {
+ handler.onResult(new SendResult(getSession()));
+ }
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
