From 092657aa794a58f97ec99a12157c840ef7d07e91 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sat, 8 Jun 2019 13:44:45 -0700
Subject: [PATCH] GUACAMOLE-422: Replace non-short-circuit logic in null check
 (`&`) with proper short-circuit logic (`&&`).

Checking `timezone != null & !timezone.isEmpty()` will result in a
`NullPointerException` when `timezone` is null, as the `&` ensures
`timezone.isEmpty()` will run in all cases.
---
 .../org/apache/guacamole/tunnel/TunnelRequestService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
index 9f0fdfaf3..598a4e57b 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
@@ -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;