GUACAMOLE-774: Remove unnecessary null checks.

This commit is contained in:
Virtually Nick
2019-08-12 20:13:37 -04:00
parent c7b21b8812
commit e5fab49d75

View File

@@ -66,12 +66,10 @@ public class RadiusAuthenticationProviderModule extends AbstractModule {
// Check for MD4 requirement // Check for MD4 requirement
RadiusAuthenticationProtocol authProtocol = environment.getProperty(RadiusGuacamoleProperties.RADIUS_AUTH_PROTOCOL); RadiusAuthenticationProtocol authProtocol = environment.getProperty(RadiusGuacamoleProperties.RADIUS_AUTH_PROTOCOL);
RadiusAuthenticationProtocol innerProtocol = environment.getProperty(RadiusGuacamoleProperties.RADIUS_EAP_TTLS_INNER_PROTOCOL); RadiusAuthenticationProtocol innerProtocol = environment.getProperty(RadiusGuacamoleProperties.RADIUS_EAP_TTLS_INNER_PROTOCOL);
if ((authProtocol != null if (authProtocol == RadiusAuthenticationProtocol.MSCHAPv1
&& (authProtocol == RadiusAuthenticationProtocol.MSCHAPv1 || authProtocol == RadiusAuthenticationProtocol.MSCHAPv2
|| authProtocol == RadiusAuthenticationProtocol.MSCHAPv2)) || innerProtocol == RadiusAuthenticationProtocol.MSCHAPv1
|| (innerProtocol != null || innerProtocol == RadiusAuthenticationProtocol.MSCHAPv2) {
&& (innerProtocol == RadiusAuthenticationProtocol.MSCHAPv1
|| innerProtocol == RadiusAuthenticationProtocol.MSCHAPv2))) {
Security.addProvider(new Provider("MD4", 0.00, "MD4 for MSCHAPv1/2 Support") { Security.addProvider(new Provider("MD4", 0.00, "MD4 for MSCHAPv1/2 Support") {
{ {