GUACAMOLE-38: Leave default port to individual protocols.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/5c96cd63 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/5c96cd63 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/5c96cd63 Branch: refs/heads/staging/1.0.0 Commit: 5c96cd63267abf184d9a689f694f0a1e4da453d5 Parents: 6c71f4d Author: Nick Couchman <[email protected]> Authored: Sat Mar 24 20:44:02 2018 -0400 Committer: Nick Couchman <[email protected]> Committed: Fri Jun 1 13:40:50 2018 -0400 ---------------------------------------------------------------------- .../guacamole/auth/quickconnect/utility/QCParser.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5c96cd63/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java index 3de9e80..30121df 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java @@ -45,11 +45,6 @@ public class QCParser { public static final String DEFAULT_URI_HOST = "localhost"; /** - * The default port to use if one is not defined. - */ - public static final Integer DEFAULT_URI_PORT = 22; - - /** * Parse out a URI string and get a connection from that string, * or an exception if the parsing fails. * @@ -89,9 +84,6 @@ public class QCParser { if (host == null || host.equals("")) host = DEFAULT_URI_HOST; - if (port == -1 || port < 1) - port = DEFAULT_URI_PORT; - if (query != null && !query.equals("")) paramList = Arrays.asList(query.split("&")); @@ -106,7 +98,9 @@ public class QCParser { GuacamoleConfiguration qcConfig = new GuacamoleConfiguration(); qcConfig.setProtocol(protocol); qcConfig.setParameter("hostname",host); - qcConfig.setParameter("port", Integer.toString(port)); + + if (port > 0) + qcConfig.setParameter("port", Integer.toString(port)); if (username != null) qcConfig.setParameter("username", username);
