Merge pull request #566 from rhusar/MODCLUSTER-746

MODCLUSTER-746 Creating an IPv4 multicast socket on Windows while jav…

Author: rhusar

core/src/main/java/org/jboss/modcluster/ModClusterService.java

@@ -21,7 +21,6 @@
  */
 package org.jboss.modcluster;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
@@ -160,7 +159,7 @@ public synchronized void init(Server server) {
         if (Boolean.TRUE.equals(advertise) || (advertise == null && this.mcmpConfig.getProxyConfigurations().isEmpty())) {
             try {
                 this.advertiseListener = this.listenerFactory.createListener(this.mcmpHandler, this.advertiseConfig);
-            } catch (IOException e) {
+            } catch (Throwable e) {
                 ModClusterLogger.LOGGER.advertiseStartFailed(e);
             }
         }
@@ -194,7 +193,7 @@ public synchronized void shutdown() {
         if (this.advertiseListener != null) {
             try {
                 this.advertiseListener.close();
-            } catch (IOException e) {
+            } catch (Throwable e) {
                 ModClusterLogger.LOGGER.catchingDebug(e);
             }
 

core/src/main/java/org/jboss/modcluster/advertise/impl/DatagramChannelFactoryImpl.java

@@ -90,9 +90,12 @@ public DatagramChannel createDatagramChannel(InetSocketAddress multicastSocketAd
             throw ModClusterLogger.LOGGER.createMulticastSocketWithUnicastAddress(address);
         }
 
+        // Avoid MODCLUSTER-746 Creating an IPv4 multicast socket on Windows while java.net.preferIPv6Addresses=true can throw UnsupportedAddressTypeException
+        InetSocketAddress bindToPort = (address instanceof Inet4Address) ? new InetSocketAddress("0.0.0.0", port) : new InetSocketAddress("::", port);
+
         // Windows-like
         if (!canBindToMulticastAddress) {
-            return newChannel(address, new InetSocketAddress(port));
+            return newChannel(address, bindToPort);
         }
 
         // Linux-like
@@ -101,7 +104,7 @@ public DatagramChannel createDatagramChannel(InetSocketAddress multicastSocketAd
         } catch (IOException e) {
             ModClusterLogger.LOGGER.potentialCrossTalking(address, (address instanceof Inet4Address) ? "IPv4" : "IPv6", e.getLocalizedMessage());
             ModClusterLogger.LOGGER.catchingDebug(e);
-            return newChannel(address, new InetSocketAddress(port));
+            return newChannel(address, bindToPort);
         }
     }