GUACAMOLE-422: Merge correct non-short-circuit logic in null check.

This commit is contained in:
Virtually Nick
2019-06-08 17:32:41 -04:00
committed by GitHub

View File

@@ -167,9 +167,9 @@ public class TunnelRequestService {
if (imageMimetypes != null)
info.getImageMimetypes().addAll(imageMimetypes);
// Get the timezone value
// Set timezone if provided
String timezone = request.getTimezone();
if (timezone != null & !timezone.isEmpty())
if (timezone != null && !timezone.isEmpty())
info.setTimezone(timezone);
return info;