From e5fab49d75c19df2a4a991f21d7d0cc65ac701cd Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Mon, 12 Aug 2019 20:13:37 -0400 Subject: [PATCH] GUACAMOLE-774: Remove unnecessary null checks. --- .../radius/RadiusAuthenticationProviderModule.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java index 842ce8b52..d34b0b344 100644 --- a/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-radius/src/main/java/org/apache/guacamole/auth/radius/RadiusAuthenticationProviderModule.java @@ -66,12 +66,10 @@ public class RadiusAuthenticationProviderModule extends AbstractModule { // Check for MD4 requirement RadiusAuthenticationProtocol authProtocol = environment.getProperty(RadiusGuacamoleProperties.RADIUS_AUTH_PROTOCOL); RadiusAuthenticationProtocol innerProtocol = environment.getProperty(RadiusGuacamoleProperties.RADIUS_EAP_TTLS_INNER_PROTOCOL); - if ((authProtocol != null - && (authProtocol == RadiusAuthenticationProtocol.MSCHAPv1 - || authProtocol == RadiusAuthenticationProtocol.MSCHAPv2)) - || (innerProtocol != null - && (innerProtocol == RadiusAuthenticationProtocol.MSCHAPv1 - || innerProtocol == RadiusAuthenticationProtocol.MSCHAPv2))) { + if (authProtocol == RadiusAuthenticationProtocol.MSCHAPv1 + || authProtocol == RadiusAuthenticationProtocol.MSCHAPv2 + || innerProtocol == RadiusAuthenticationProtocol.MSCHAPv1 + || innerProtocol == RadiusAuthenticationProtocol.MSCHAPv2) { Security.addProvider(new Provider("MD4", 0.00, "MD4 for MSCHAPv1/2 Support") { {