You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2026/09/03 10:02:27 UTC
(tomcat) branch 11.0.x updated: Simplify
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 3d8da1987b Simplify
3d8da1987b is described below
commit 3d8da1987ba5426cbc760db3d76f74a921662a6f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 3 11:00:54 2026 +0100
Simplify
---
.../tomcat/websocket/server/WsRemoteEndpointImplServer.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
index c0bd087140..9322848992 100644
--- a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
@@ -313,13 +313,11 @@ public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase {
@Override
protected void doClose() {
- if (handler != null) {
- // close() can be triggered by a wide range of scenarios. It is far
- // simpler just to always use a dispatch than it is to try and track
- // whether or not this method was called by the same thread that
- // triggered the write
- clearHandler(new EOFException(), true);
- }
+ /*
+ * close() can be triggered by a wide range of scenarios. It is far simpler just to always use a dispatch than
+ * it is to try and track whether or not this method was called by the same thread that triggered the write
+ */
+ clearHandler(new EOFException(), true);
try {
socketWrapper.close();
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org