Fix sending completion message for already sent error message

scalecube · Sep 16, 2021 · 4e26646 · 4e26646
1 parent 4104111
commit 4e26646
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/...ateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketGatewayAcceptor.java b/...ateway-netty/src/main/java/io/scalecube/services/gateway/ws/WebsocketGatewayAcceptor.java
@@ -202,13 +202,15 @@ private void onRequest(WebsocketGatewaySession session, ServiceMessage request,
                           }
                           return newResponseMessage(sid, response, isErrorResponse);
                         }))
-            .doOnError(th -> ReferenceCountUtil.safestRelease(request.data()))
             .doOnError(
-                th ->
-                    session
-                        .send(toErrorResponse(errorMapper, request, th))
-                        .contextWrite(context)
-                        .subscribe())
+                th -> {
+                  ReferenceCountUtil.safestRelease(request.data());
+                  receivedError.set(true);
+                  session
+                      .send(toErrorResponse(errorMapper, request, th))
+                      .contextWrite(context)
+                      .subscribe();
+                })
             .doOnTerminate(
                 () -> {
                   if (!receivedError.get()) {