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/12151tags/7.7.23
@@ -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(); |
@@ -3,12 +3,13 @@ package com.vaadin.tests.push; | |||
import com.vaadin.annotations.PreserveOnRefresh; | |||
import com.vaadin.annotations.Push; | |||
import com.vaadin.server.VaadinRequest; | |||
import com.vaadin.shared.ui.ui.Transport; | |||
import com.vaadin.tests.components.AbstractReindeerTestUI; | |||
import com.vaadin.tests.util.Log; | |||
import com.vaadin.ui.Label; | |||
@PreserveOnRefresh | |||
@Push | |||
@Push(transport = Transport.WEBSOCKET_XHR) | |||
public class PushWithPreserveOnRefresh extends AbstractReindeerTestUI { | |||
private Log log = new Log(5); | |||
@@ -16,6 +17,7 @@ public class PushWithPreserveOnRefresh extends AbstractReindeerTestUI { | |||
@Override | |||
protected void setup(VaadinRequest request) { | |||
setTheme("valo"); | |||
// Internal parameter sent by vaadinBootstrap.js, | |||
addComponent(new Label("window.name: " + request.getParameter("v-wn"))); | |||
addComponent(new Label("UI id: " + getUIId())); |