Merge pull request #546 from jaikiran/UNDERTOW-1016

[master branch] UNDERTOW-1016 Fix potential NPE while dealing with unresolved InetSocketAddress
undertow-io · Aug 22, 2017 · a1845f7 · a1845f7
2 parents 52a3c8d + d95237e
commit a1845f7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/main/java/io/undertow/server/handlers/proxy/mod_cluster/MCMPConfig.java b/core/src/main/java/io/undertow/server/handlers/proxy/mod_cluster/MCMPConfig.java
@@ -43,12 +43,12 @@ public static WebBuilder webBuilder() {
 
     public MCMPConfig(Builder builder) {
         this.managementSocketAddress = new InetSocketAddress(builder.managementHost, builder.managementPort);
-        if (managementSocketAddress.getAddress().isAnyLocalAddress()) {
-            throw UndertowLogger.PROXY_REQUEST_LOGGER.cannotUseWildcardAddressAsModClusterManagementHost(builder.managementHost);
-        }
         if (managementSocketAddress.isUnresolved()) {
             throw UndertowLogger.PROXY_REQUEST_LOGGER.unableToResolveModClusterManagementHost(builder.managementHost);
         }
+        if (managementSocketAddress.getAddress().isAnyLocalAddress()) {
+            throw UndertowLogger.PROXY_REQUEST_LOGGER.cannotUseWildcardAddressAsModClusterManagementHost(builder.managementHost);
+        }
         if (builder.advertiseBuilder != null) {
             this.advertiseConfig = new AdvertiseConfig(builder.advertiseBuilder, this);
         } else {