Author: bstansberry(a)jboss.com Date: 2008-10-28 19:02:50 -0400 (Tue, 28 Oct 2008) New Revision: 2016 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java Log: Paul thinks my code is ugly Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2008-10-28 22:25:35 UTC (rev 2015) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2008-10-28 23:02:50 UTC (rev 2016) @@ -426,33 +426,36 @@ private MulticastSocket createMulticastSocket(InetAddress mcast_addr, int port) throws IOException { - if(mcast_addr != null && !mcast_addr.isMulticastAddress()) { + if (mcast_addr != null && !mcast_addr.isMulticastAddress()) + { log.warn("mcast_addr (" + mcast_addr + ") is not a multicast address, will be ignored"); return new MulticastSocket(port); - } + } - SocketAddress saddr=new InetSocketAddress(mcast_addr, port); - MulticastSocket retval=null; + SocketAddress saddr = new InetSocketAddress(mcast_addr, port); + MulticastSocket retval = null; - try { - retval=new MulticastSocket(saddr); - } - catch(IOException ex) { - StringBuilder sb=new StringBuilder(); - String type=mcast_addr != null ? mcast_addr instanceof Inet4Address? "IPv4" : "IPv6" : "n/a"; - sb.append("could not bind to " + mcast_addr + " (" + type + " address)"); - sb.append("; make sure your mcast_addr is of the same type as the IP stack (IPv4 or IPv6)."); - sb.append("\nWill ignore mcast_addr, but this may lead to cross talking " + - "(see http://www.jboss.com/wiki/Edit.jsp?page=CrossTalking for details). "); - sb.append("\nException was: " + ex); - log.warn(sb); - } - if(retval == null) - { - retval=new MulticastSocket(port); - } - return retval; - } + try + { + retval = new MulticastSocket(saddr); + } + catch (IOException ex) + { + StringBuilder sb = new StringBuilder(); + String type = mcast_addr != null ? mcast_addr instanceof Inet4Address ? "IPv4" : "IPv6" : "n/a"; + sb.append("could not bind to " + mcast_addr + " (" + type + " address)"); + sb.append("; make sure your mcast_addr is of the same type as the IP stack (IPv4 or IPv6)."); + sb.append("\nWill ignore mcast_addr, but this may lead to cross talking " + + "(see http://www.jboss.com/wiki/Edit.jsp?page=CrossTalking for details). "); + sb.append("\nException was: " + ex); + log.warn(sb); + } + if (retval == null) + { + retval = new MulticastSocket(port); + } + return retval; + } // ------------------------------------ AdvertiseListenerWorker Inner Class class AdvertiseListenerWorker implements Runnable