Browse Source

Do not restart application if messages are received (#16868)

Change-Id: I5ede5efb7ae9a171fac79f2ead98e2fb12c249c4
tags/7.4.1
Artur Signell 9 years ago
parent
commit
423bd5aa2e
1 changed files with 11 additions and 3 deletions
  1. 11
    3
      client/src/com/vaadin/client/ApplicationConnection.java

+ 11
- 3
client/src/com/vaadin/client/ApplicationConnection.java View File

@@ -62,7 +62,6 @@ import com.google.gwt.user.client.Window.ClosingHandler;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.Widget;
import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
import com.vaadin.client.ResourceLoader.ResourceLoadListener;
import com.vaadin.client.communication.HasJavaScriptConnectorHelper;
@@ -1062,8 +1061,17 @@ public class ApplicationConnection implements HasHandlers {
if (isApplicationRunning()) {
handleReceivedJSONMessage(start, jsonText, json);
} else {
setApplicationRunning(true);
handleWhenCSSLoaded(jsonText, json);
if (!cssLoaded) {
// Application is starting up for the first time
setApplicationRunning(true);
handleWhenCSSLoaded(jsonText, json);
} else {
getLogger()
.warning(
"Ignored received message because application has already been stopped");
return;

}
}
}


Loading…
Cancel
Save