diff options
| author | Markus Koivisto <markus@vaadin.com> | 2015-04-08 14:53:27 +0300 |
|---|---|---|
| committer | Markus Koivisto <markus@vaadin.com> | 2015-04-08 14:53:27 +0300 |
| commit | 2478267d11fddfd798fee89227b5f258441e1331 (patch) | |
| tree | ad41582f60af26d2b47959f00130f48a0a510919 /client | |
| parent | a1aa700db37f727bb6a3690f1704d3ec512ee468 (diff) | |
| parent | 6abcbdf1eeb8f23ebda97df3ffad7b0abdee37ea (diff) | |
| download | vaadin-framework-2478267d11fddfd798fee89227b5f258441e1331.tar.gz vaadin-framework-2478267d11fddfd798fee89227b5f258441e1331.zip | |
Merge branch 'master' into grid-7.5
Conflicts:
WebContent/release-notes.html
Change-Id: I3906caeb01d1991dc9cb927b3d9ce0fb21c77e04
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/communication/AtmospherePushConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java index e544c91d0f..cd989d7ea4 100644 --- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java +++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java @@ -197,7 +197,7 @@ public class AtmospherePushConnection implements PushConnection { private void connect() { String baseUrl = connection .translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX - + ApplicationConstants.PUSH_PATH + '/'); + + ApplicationConstants.PUSH_PATH); String extraParams = UIConstants.UI_ID_PARAMETER + "=" + connection.getConfiguration().getUIId(); |