This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit dbcdd252e3b79ae9654c06db120c4e11ef57675f Author: Benoit Tellier <[email protected]> AuthorDate: Sun Jun 27 13:49:48 2021 +0700 JAMES-3491 WebSocket should unregister resources on cancels --- .../src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala index 4585a27..16b2241 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala @@ -33,7 +33,7 @@ import org.apache.james.jmap.HttpConstants.JSON_CONTENT_TYPE import org.apache.james.jmap.JMAPUrls.JMAP_WS import org.apache.james.jmap.api.change.{EmailChangeRepository, MailboxChangeRepository} import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} -import org.apache.james.jmap.change.{AccountIdRegistrationKey, StateChangeListener, TypeName, _} +import org.apache.james.jmap.change.{AccountIdRegistrationKey, StateChangeListener, _} import org.apache.james.jmap.core.{OutboundMessage, ProblemDetails, RequestId, WebSocketError, WebSocketPushDisable, WebSocketPushEnable, WebSocketRequest, WebSocketResponse, _} import org.apache.james.jmap.exceptions.UnauthorizedException import org.apache.james.jmap.http.rfc8621.InjectionKeys @@ -111,6 +111,7 @@ class WebSocketRoutes @Inject() (@Named(InjectionKeys.RFC_8621) val authenticato }) .flatMap(message => handleClientMessages(context)(message)) .doOnTerminate(context.clean) + .doOnCancel(context.clean) out.sendString( SFlux.merge(Seq(responseFlux, sink.asFlux())) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
