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-422: Replace non-short-circuit logic in null check (&) with proper short-circuit logic (&&).

Browse Source 
Checking `timezone != null & !timezone.isEmpty()` will result in a
`NullPointerException` when `timezone` is null, as the `&` ensures
`timezone.isEmpty()` will run in all cases.
This commit is contained in:
Michael Jumper
2019-06-08 13:44:45 -07:00
parent f2ae848b1b
commit 092657aa79
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelRequestService.java
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;