diff options
| author | Artur Signell <artur@vaadin.com> | 2015-08-31 11:43:31 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2015-08-31 13:23:24 +0300 |
| commit | 9aafe4d1c535e9f79c09f33d2e1a1f8cc344eaa0 (patch) | |
| tree | 59a3e8acc083a06376c62e95a8b2f9ff7c0610a4 /client | |
| parent | b71cc2ffa9b96cfcaa045692eee4952678391850 (diff) | |
| download | vaadin-framework-9aafe4d1c535e9f79c09f33d2e1a1f8cc344eaa0.tar.gz vaadin-framework-9aafe4d1c535e9f79c09f33d2e1a1f8cc344eaa0.zip | |
Use Transport.WEBSOCKET_XHR instead of setter for mixing websockets and XHR (#11733)
Change-Id: I2fad7d367d8a4ba476ae0705672ebc2ee7cfeb1c
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/communication/ServerCommunicationHandler.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/communication/ServerCommunicationHandler.java b/client/src/com/vaadin/client/communication/ServerCommunicationHandler.java index 38b3321b27..12f7dee1d1 100644 --- a/client/src/com/vaadin/client/communication/ServerCommunicationHandler.java +++ b/client/src/com/vaadin/client/communication/ServerCommunicationHandler.java @@ -328,11 +328,17 @@ public class ServerCommunicationHandler { * @return A string representation of the current transport type */ public String getCommunicationMethodName() { + String clientToServer = "XHR"; + String serverToClient = "-"; if (push != null) { - return "Push (" + push.getTransportType() + ")"; - } else { - return "XHR"; + serverToClient = push.getTransportType(); + if (push.isBidirectional()) { + clientToServer = serverToClient; + } } + + return "Client to server: " + clientToServer + ", " + + "server to client: " + serverToClient; } private CommunicationProblemHandler getCommunicationProblemHandler() { |