adam/guacamole-client
1
0 Fork 0
Code Issues Pull Requests 1 Packages Releases Wiki Activity

Merge 1.1.0 changes bcak to master.

Browse Source
This commit is contained in:
Virtually Nick committed 2019-06-08 17:34:11 -04:00
2 parents 4df22ce67b 203c4d9b58
commit ee6a79933e
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
+2 -2
View File
@@ -167,9 +167,9 @@ public class TunnelRequestService {
if (imageMimetypes != null) if (imageMimetypes != null)
info.getImageMimetypes().addAll(imageMimetypes); info.getImageMimetypes().addAll(imageMimetypes);
// Get the timezone value // Set timezone if provided
String timezone = request.getTimezone(); String timezone = request.getTimezone();
if (timezone != null & !timezone.isEmpty()) if (timezone != null && !timezone.isEmpty())
info.setTimezone(timezone); info.setTimezone(timezone);
return info; return info;