From f7ff95f8a9dc6bdb721162eceb1879974eff252e Mon Sep 17 00:00:00 2001 From: Mikael Grankvist Date: Fri, 10 Jan 2025 09:24:15 +0200 Subject: [PATCH] Do not queue when using bidirectional push --- .../vaadin/client/communication/MessageSender.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flow-client/src/main/java/com/vaadin/client/communication/MessageSender.java b/flow-client/src/main/java/com/vaadin/client/communication/MessageSender.java index 8dc9eb0463c..eca61f6f449 100644 --- a/flow-client/src/main/java/com/vaadin/client/communication/MessageSender.java +++ b/flow-client/src/main/java/com/vaadin/client/communication/MessageSender.java @@ -231,12 +231,6 @@ private void sendPayload(final JsonObject payload) { payload.put(ApplicationConstants.CLIENT_TO_SERVER_ID, clientToServerMessageId++); - if (!registry.getRequestResponseTracker().hasActiveRequest()) { - // Direct calls to send from outside probably have not started - // request. - registry.getRequestResponseTracker().startRequest(); - } - if (push != null && push.isBidirectional()) { // When using bidirectional transport, the payload is not resent // to the server during reconnection attempts. @@ -248,6 +242,12 @@ private void sendPayload(final JsonObject payload) { pushPendingMessage = payload; push.push(payload); } else { + if (!registry.getRequestResponseTracker().hasActiveRequest()) { + // Direct calls to send from outside probably have not started + // request. + registry.getRequestResponseTracker().startRequest(); + } + Console.debug("send XHR"); registry.getXhrConnection().send(payload);