You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/10/02 14:13:59 UTC
[incubator-dlab] 01/02: DLAB-000 fixed bug connected with web
terminal
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b441385a150cb3cd7ab66ab3bd3e9122b467cba9
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Oct 2 17:13:13 2019 +0300
DLAB-000 fixed bug connected with web terminal
---
.../epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
index e64ce09..30f9f82 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/GuacamoleServiceImpl.java
@@ -47,8 +47,11 @@ public class GuacamoleServiceImpl implements GuacamoleService {
final String url = endpointService.get(endpoint).getUrl();
String key = provisioningService.get(url + KeyAPI.GET_ADMIN_KEY,
userInfo.getAccessToken(), String.class);
- InetGuacamoleSocket socket = new InetGuacamoleSocket(new URI(url).getHost(), conf.getGuacamolePort());
- GuacamoleConfiguration guacamoleConfig = getGuacamoleConfig(key, conf.getGuacamole(), host);
+ final String guacamoleServerHost = new URI(url).getHost();
+ InetGuacamoleSocket socket = new InetGuacamoleSocket(guacamoleServerHost, conf.getGuacamolePort());
+ final Map<String, String> guacamoleConf = conf.getGuacamole();
+ guacamoleConf.put("serverHost", guacamoleServerHost);
+ GuacamoleConfiguration guacamoleConfig = getGuacamoleConfig(key, guacamoleConf, host);
return new SimpleGuacamoleTunnel(new ConfiguredGuacamoleSocket(socket, guacamoleConfig));
} catch (Exception e) {
log.error("Can not create guacamole tunnel due to: " + e.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org