From 064880b08a61e161d672e7dfcebbdf6622cbc71f Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Fri, 7 Apr 2006 13:20:16 +0000
Subject: [PATCH] Was having some jmx dup id issues.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@392283 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/broker/TransportConnector.java   | 23 ++++++++-----------
 .../broker/jmx/ManagedTransportConnector.java |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
index 920207ce3f..f4733ce557 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -149,6 +149,12 @@ public class TransportConnector implements Connector {
     }
 
     public URI getUri() {
+        if( uri == null ) {
+            try {
+                uri = getConnectUri();
+            } catch (Throwable e) {
+            }
+        }
         return uri;
     }
 
@@ -265,10 +271,9 @@ public class TransportConnector implements Connector {
 
     public URI getConnectUri() throws IOException, URISyntaxException {
         if( connectUri==null ) {
-            if( getServer().getConnectURI()==null ) {
-                throw new IllegalStateException("The transportConnector has not been started.");
+            if( server !=null ) {
+                connectUri = server.getConnectURI();
             }
-            connectUri = getServer().getConnectURI();
         }
         return connectUri;
     }
@@ -286,16 +291,8 @@ public class TransportConnector implements Connector {
     }
 
     public String getName(){
-        if(name==null){
-            if(server!=null){
-                if(server.getConnectURI()!=null){
-                    name=server.getConnectURI().toString();
-                }else{
-                    name = server.getClass() + ":Not started";
-                }
-            }else{
-                name = "NOT_SET";
-            }
+        if( name==null ){
+            name = getUri().toString();
         }
         return name;
     }
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
index 72d90fcd34..a772b04f60 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnector.java
@@ -57,7 +57,7 @@ public class ManagedTransportConnector extends TransportConnector {
     }
 
     protected static synchronized long getNextConnectionId() {
-        return nextConnectionId;
+        return nextConnectionId++;
     }
 
 }