Applied patch for https://issues.apache.org/activemq/browse/AMQ-1465

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@646803 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java

@@ -202,7 +202,13 @@ public class DiscoveryNetworkConnector extends NetworkConnector implements Disco
     }
 
     public String getName() {
-        return discoveryAgent.toString();
+        String name = super.getName();
+        if (name == null) {
+            name = discoveryAgent.toString();
+            ;
+            super.setName(name);
+        }
+        return name;
     }
 
 }

activemq-core/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java

@@ -88,6 +88,8 @@ public class      LdapNetworkConnector
 
    // local context
    private DirContext context = null;
+   //currently in use URI
+   private URI ldapURI = null;
 
    /**
     * returns the next URI from the configured list
@@ -195,9 +197,9 @@ public class      LdapNetworkConnector
       LOG.info("connecting...");
       Hashtable<String, String> env = new Hashtable();
       env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-      URI uri = getUri();
+      this.ldapURI = getUri();
-      LOG.debug("    URI [" + uri + "]");
+      LOG.debug("    URI [" + this.ldapURI + "]");
-      env.put(Context.PROVIDER_URL, uri.toString());
+      env.put(Context.PROVIDER_URL, this.ldapURI.toString());
       if(anonymousAuthentication)
       {
          LOG.debug("    login credentials [anonymous]");
@@ -221,9 +223,9 @@ public class      LdapNetworkConnector
          {
             if(failover)
             {
-               uri = getUri();
+                this.ldapURI = getUri();
-               LOG.error("connection error [" + env.get(Context.PROVIDER_URL) + "], failover connection to [" + uri.toString() + "]");
+               LOG.error("connection error [" + env.get(Context.PROVIDER_URL) + "], failover connection to [" + this.ldapURI.toString() + "]");
-               env.put(Context.PROVIDER_URL, uri.toString());
+               env.put(Context.PROVIDER_URL, this.ldapURI.toString());
                Thread.sleep(curReconnectDelay);
                curReconnectDelay = Math.min(curReconnectDelay * 2, maxReconnectDelay);
             }
@@ -272,13 +274,21 @@ public class      LdapNetworkConnector
     *
     * @return connector name
     */
-   public String getName()
+   public String getName() {
-      { return toString(); }
+
+        String name = super.getName();
+        if (name == null) {
+            name = this.getClass().getName() + " [" + ldapURI.toString() + "]";
+            super.setName(name);
+        }
+        return name;
+    }
 
    /**
      * add connector of the given URI
      * 
-    * @param result search result of connector to add
+     * @param result
+     *            search result of connector to add
      */
    protected synchronized void addConnector(SearchResult result)
       throws Exception

activemq-core/src/main/java/org/apache/activemq/network/MulticastNetworkConnector.java

@@ -142,7 +142,12 @@ public class MulticastNetworkConnector extends NetworkConnector {
     }
 
     public String getName() {
-        return remoteTransport.toString();
+        String name = super.getName();
+        if(name == null) {
+            name = remoteTransport.toString();
+            super.setName(name);
+        }
+        return name;
     }
 
     protected DemandForwardingBridgeSupport createBridge(Transport local, Transport remote) {

activemq-core/src/main/java/org/apache/activemq/network/NetworkBridgeConfiguration.java

@@ -35,7 +35,7 @@ public class NetworkBridgeConfiguration {
     private String userName;
     private String password;
     private String destinationFilter = ">";
-    private String name = "localhost";
+    private String name = null;
 
     /**
      * @return the conduitSubscriptions
@@ -210,6 +210,9 @@ public class NetworkBridgeConfiguration {
      * @return the name
      */
     public String getName() {
+        if(this.name == null) {
+            this.name = "localhost";
+        }
         return this.name;
     }
 

activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java

@@ -201,8 +201,6 @@ public abstract class NetworkConnector extends NetworkBridgeConfiguration implem
         serviceSupport.stop();
     }
 
-    public abstract String getName();
-
     protected void handleStart() throws Exception {
         if (localURI == null) {
             throw new IllegalStateException("You must configure the 'localURI' property");
@@ -263,6 +261,7 @@ public abstract class NetworkConnector extends NetworkBridgeConfiguration implem
         }
     }
     
+
     @SuppressWarnings("unchecked")
     protected ObjectName createNetworkBridgeObjectName(NetworkBridge bridge) throws MalformedObjectNameException {
         ObjectName connectorName = getObjectName();