safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-38: Fix up string checks in QCParser class.

Browse Source
This commit is contained in:
Nick Couchman
2018-04-17 22:29:46 -04:00
parent 0cbf90a55d
commit cf241f041e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/utility/QCParser.java
View File

@@ -95,16 +95,16 @@ public class QCParser {
String password = null; String password = null;
List<String> paramList = null; List<String> paramList = null;
if (protocol == null || protocol.equals("")) if (protocol == null || protocol.isEmpty())
protocol = DEFAULT_URI_PROTOCOL; protocol = DEFAULT_URI_PROTOCOL;
if (host == null || host.equals("")) if (host == null || host.isEmpty())
host = DEFAULT_URI_HOST; host = DEFAULT_URI_HOST;
if (query != null && !query.equals("")) if (query != null && !query.isEmpty())
paramList = Arrays.asList(query.split("&")); paramList = Arrays.asList(query.split("&"));
if (userInfo != null && !userInfo.equals("")) { if (userInfo != null && !userInfo.isEmpty()) {
Matcher userinfoMatcher = userinfoPattern.matcher(userInfo); Matcher userinfoMatcher = userinfoPattern.matcher(userInfo);
if (userinfoMatcher.matches()) { if (userinfoMatcher.matches()) {
@@ -121,15 +121,15 @@ public class QCParser {
if (port > 0) if (port > 0)
qcConfig.setParameter("port", Integer.toString(port)); qcConfig.setParameter("port", Integer.toString(port));
if (username != null && username.length() > 0) if (username != null && !username.isEmpty())
qcConfig.setParameter("username", username); qcConfig.setParameter("username", username);
if (password != null && password.length() > 0) if (password != null && !password.isEmpty())
qcConfig.setParameter("password", password); qcConfig.setParameter("password", password);
if (paramList != null) { if (paramList != null) {
for (String parameter : paramList) { for (String parameter : paramList) {
String[] paramArray = parameter.split("="); String[] paramArray = parameter.split("=", 2);
qcConfig.setParameter(paramArray[0],paramArray[1]); qcConfig.setParameter(paramArray[0],paramArray[1]);
} }
} }
@@ -166,16 +166,16 @@ public class QCParser {
String name = ""; String name = "";
if (protocol != null && !protocol.equals("")) if (protocol != null && !protocol.isEmpty())
name += protocol + "://"; name += protocol + "://";
if (user != null && !user.equals("")) if (user != null && !user.isEmpty())
name += user + "@"; name += user + "@";
if (host != null && !host.equals("")) if (host != null && !host.isEmpty())
name += host; name += host;
if (port != null && !port.equals("")) if (port != null && !port.isEmpty())
name += ":" + port; name += ":" + port;
name += "/"; name += "/";