From 063c551dcf327bdd82be5411b5a45a63f21760a9 Mon Sep 17 00:00:00 2001
From: Virtually Nick <vnick@apache.org>
Date: Sun, 30 May 2021 22:18:31 -0400
Subject: [PATCH] GUACAMOLE-1252: Fix potential null dereference getting NAS
 IP.

---
 .../apache/guacamole/auth/radius/conf/ConfigurationService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/conf/ConfigurationService.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/conf/ConfigurationService.java
index 6a44f4660..78738ed53 100644
--- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/conf/ConfigurationService.java
+++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/conf/ConfigurationService.java
@@ -351,7 +351,7 @@ public class ConfigurationService {
             String nasIpStr = environment.getProperty(RadiusGuacamoleProperties.RADIUS_NAS_IP);
             
             // If property is specified and non-empty, attempt to return converted address.
-            if (!(nasIpStr == null && nasIpStr.isEmpty()))
+            if (nasIpStr != null && !nasIpStr.isEmpty())
                 return InetAddress.getByName(nasIpStr);
             
             // By default, return the address of the server.