[WFCORE-5520] Avoid Nullpointer (Remoting)

Fixes https://issues.redhat.com/browse/WFCORE-5520
wildfly · Aug 30, 2021 · 5a659c8 · 5a659c8
1 parent bfc83ff
commit 5a659c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/remoting/subsystem/src/main/java/org/jboss/as/remoting/RemotingHttpUpgradeService.java b/remoting/subsystem/src/main/java/org/jboss/as/remoting/RemotingHttpUpgradeService.java
@@ -165,7 +165,7 @@ public synchronized void start(final StartContext context) throws StartException
 
                 Option<?> optionMechanismNames = Option.fromString("org.xnio.Options."+ Options.SASL_MECHANISMS.getName(), loader);
                 String[] mechanismNames = null;
-                if(connectorPropertiesOptionMap.contains(optionMechanismNames)) {
+                if(connectorPropertiesOptionMap != null && connectorPropertiesOptionMap.contains(optionMechanismNames)) {
                     Object o = connectorPropertiesOptionMap.get(optionMechanismNames);
                     if (o instanceof Sequence) {
                         Sequence<String> sequence = (Sequence<String>) connectorPropertiesOptionMap.get(optionMechanismNames);
@@ -176,7 +176,7 @@ public synchronized void start(final StartContext context) throws StartException
                 Option<?> optionPolicyNonanonymous = Option.fromString("org.xnio.Options."+ Options.SASL_POLICY_NOANONYMOUS.getName(), loader);
                 //in case that legacy sasl mechanisms are used, noanonymous default value is true
                 Boolean policyNonanonymous = mechanismNames == null ? null: true;
-                if(connectorPropertiesOptionMap.contains(optionPolicyNonanonymous)) {
+                if(connectorPropertiesOptionMap != null && connectorPropertiesOptionMap.contains(optionPolicyNonanonymous)) {
                     Object o = connectorPropertiesOptionMap.get(optionPolicyNonanonymous);
                     if (o instanceof Boolean) {
                         policyNonanonymous = (Boolean) o;