CODENVY-529: fix terminal uri usage (#1286)

Signed-off-by: Alexander Garagatyi <[email protected]>
eclipse-che · May 18, 2016 · 54db11a · 54db11a
1 parent 24d560f
commit 54db11a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...xt-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/Machine.java b/...xt-client/src/main/java/org/eclipse/che/ide/extension/machine/client/machine/Machine.java
@@ -113,11 +113,12 @@ public String getTerminalUrl() {
             if (Constants.TERMINAL_REFERENCE.equals(descriptor.getRef())) {
                 String terminalUrl = descriptor.getUrl();
 
-                terminalUrl = terminalUrl.substring(terminalUrl.indexOf(':'), terminalUrl.length());
+                String uriWithoutProtocol = terminalUrl.substring(terminalUrl.indexOf(':'), terminalUrl.length());
+                String protocol = Window.Location.getProtocol().equals("https:") ? "wss" : "ws";
 
-                boolean isSecureConnection = Window.Location.getProtocol().equals("https:");
-
-                return (isSecureConnection ? "wss" : "ws") + terminalUrl + "/pty";
+                return protocol +
+                       uriWithoutProtocol +
+                       (terminalUrl.endsWith("/") ? "pty" : "/pty");
             }
         }