From 21ff79aea40e2a3d998449efbae780dca3eb987e Mon Sep 17 00:00:00 2001 From: Tatu Lund Date: Thu, 7 Jan 2021 13:21:46 +0200 Subject: Move call to getMessageHandler().onResynchronize(); to right place (#12178) https://github.com/vaadin/framework/pull/12043 changed resync message sending to be deferred to queue. Now also the setting of the semaphor in message handler needs to be deferred to its right place. Otherwise there is possibility for a timing glitch. I.e. MessageHandler is set to resync handling mode before message is actually send. Fixes: https://github.com/vaadin/framework/issues/12151 --- client/src/main/java/com/vaadin/client/communication/MessageSender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/src') diff --git a/client/src/main/java/com/vaadin/client/communication/MessageSender.java b/client/src/main/java/com/vaadin/client/communication/MessageSender.java index 9a443adb2e..969e38ef5d 100644 --- a/client/src/main/java/com/vaadin/client/communication/MessageSender.java +++ b/client/src/main/java/com/vaadin/client/communication/MessageSender.java @@ -127,6 +127,7 @@ public class MessageSender { } if (resynchronizeRequested) { getLogger().info("Resynchronizing from server"); + getMessageHandler().onResynchronize(); extraJson.put(ApplicationConstants.RESYNCHRONIZE_ID, true); resynchronizeRequested = false; } @@ -356,7 +357,6 @@ public class MessageSender { * state from the server */ public void resynchronize() { - getMessageHandler().onResynchronize(); getLogger().info("Resynchronize from server requested"); resynchronizeRequested = true; sendInvocationsToServer(); -- cgit v1.2.3