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 2020/11/05 14:34:12 UTC
[tomcat] branch master updated: Additional fixes for BZ 64848
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f8fde70 Additional fixes for BZ 64848
f8fde70 is described below
commit f8fde70263fd9e5a087cf57df9af34f5e77342fb
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 94b5ccb..aaeebd8 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org