This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 69b328f Additional fixes for BZ 64848 69b328f is described below commit 69b328ff35127249c87555942de89539714572da Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Nov 5 14:33:43 2020 +0000 Additional fixes for BZ 64848 --- java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java index 75f90e6..18c723a 100644 --- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java +++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java @@ -296,13 +296,13 @@ public abstract class WsRemoteEndpointImplBase implements RemoteEndpoint { if (!messagePartInProgress.tryAcquire(timeout, TimeUnit.MILLISECONDS)) { String msg = sm.getString("wsRemoteEndpoint.acquireTimeout"); wsSession.doClose(new CloseReason(CloseCodes.GOING_AWAY, msg), - new CloseReason(CloseCodes.CLOSED_ABNORMALLY, msg)); + new CloseReason(CloseCodes.CLOSED_ABNORMALLY, msg), true); throw new SocketTimeoutException(msg); } } catch (InterruptedException e) { String msg = sm.getString("wsRemoteEndpoint.sendInterrupt"); wsSession.doClose(new CloseReason(CloseCodes.GOING_AWAY, msg), - new CloseReason(CloseCodes.CLOSED_ABNORMALLY, msg)); + new CloseReason(CloseCodes.CLOSED_ABNORMALLY, msg), true); throw new IOException(msg, e); } @@ -313,14 +313,14 @@ public abstract class WsRemoteEndpointImplBase implements RemoteEndpoint { ExceptionUtils.handleThrowable(t); messagePartInProgress.release(); wsSession.doClose(new CloseReason(CloseCodes.GOING_AWAY, t.getMessage()), - new CloseReason(CloseCodes.CLOSED_ABNORMALLY, t.getMessage())); + new CloseReason(CloseCodes.CLOSED_ABNORMALLY, t.getMessage()), true); throw t; } if (!bsh.getSendResult().isOK()) { messagePartInProgress.release(); Throwable t = bsh.getSendResult().getException(); wsSession.doClose(new CloseReason(CloseCodes.GOING_AWAY, t.getMessage()), - new CloseReason(CloseCodes.CLOSED_ABNORMALLY, t.getMessage())); + new CloseReason(CloseCodes.CLOSED_ABNORMALLY, t.getMessage()), true); throw new IOException (t); } // The BlockingSendHandler doesn't call end message so update the --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org