This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 59b0fb3937 Align with 12.0.x
59b0fb3937 is described below
commit 59b0fb3937273d23f5eca35d1bf3a45713d0a5a9
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 3 12:23:04 2026 +0100
Align with 12.0.x
---
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index f1a18ece0b..20895c9e8b 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -455,15 +455,17 @@ public abstract class WsRemoteEndpointImplBase implements
RemoteEndpoint {
} catch (IOException ioe) {
if (handler != null) {
handler.onResult(new SendResult(ioe));
- return;
}
+ return;
}
// Some extensions/transformations may buffer messages so it is
possible
// that no message parts will be returned. If this is the case the
// trigger the supplied SendHandler
if (messageParts.size() == 0) {
- handler.onResult(new SendResult());
+ if (handler != null) {
+ handler.onResult(new SendResult());
+ }
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
