diff --git a/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
index cf1da42e9f..8624a06073 100644
--- a/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
+++ b/activemq-client/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
@@ -291,27 +291,30 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, Runnable {
                 discoveryURI = new URI(DEFAULT_DISCOVERY_URI_STRING);
             }
             
-            if (LOG.isTraceEnabled()) 
-        	  	LOG.trace("start - discoveryURI = " + discoveryURI);        	  	        	  
-        	  
-        	  String myHost = discoveryURI.getHost();
-        	  int    myPort = discoveryURI.getPort(); 
-        	     
-        	  if( DEFAULT_HOST_STR.equals(myHost) ) 
-        	  	myHost = DEFAULT_HOST_IP;       	      	  
-        	  
-        	  if(myPort < 0 )
-        	    myPort = DEFAULT_PORT;        	    
-        	  
-        	  if (LOG.isTraceEnabled()) {
-        	  	LOG.trace("start - myHost = " + myHost); 
-        	  	LOG.trace("start - myPort = " + myPort);   	
-        	  	LOG.trace("start - group  = " + group );		       	  	
-        	  	LOG.trace("start - interface  = " + mcInterface );
-        	  	LOG.trace("start - network interface  = " + mcNetworkInterface );
-        	  	LOG.trace("start - join network interface  = " + mcJoinNetworkInterface );
-        	  }	
-        	  
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("start - discoveryURI = " + discoveryURI);
+            }
+
+            String myHost = discoveryURI.getHost();
+            int    myPort = discoveryURI.getPort();
+
+            if (DEFAULT_HOST_STR.equals(myHost)) {
+                myHost = DEFAULT_HOST_IP;
+            }
+
+            if (myPort < 0) {
+                myPort = DEFAULT_PORT;
+            }
+
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("start - myHost = " + myHost);
+                LOG.trace("start - myPort = " + myPort);
+                LOG.trace("start - group  = " + group);
+                LOG.trace("start - interface  = " + mcInterface);
+                LOG.trace("start - network interface  = " + mcNetworkInterface);
+                LOG.trace("start - join network interface  = " + mcJoinNetworkInterface);
+            }
+
             this.inetAddress = InetAddress.getByName(myHost);
             this.sockAddress = new InetSocketAddress(this.inetAddress, myPort);
             mcast = new MulticastSocket(myPort);