From 8322532da30ec68bf4ebdf725adbdaef19901ff4 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Wed, 25 Feb 2015 08:32:40 +0000
Subject: QPID-6410: [Java Broker] Disambiguate the connection adapter name by
 adding a connection ID to the name

Merged from trunk with command.

svn merge -c 1661929  https://svn.apache.org/repos/asf/qpid/trunk




git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1662180 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java     | 2 +-
 .../java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'qpid/java/broker-plugins')

diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
index a016ff9d9d..0787e404fa 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
@@ -100,7 +100,7 @@ public class ConnectionMBean extends AbstractStatisticsGatheringMBean<Connection
 
     public String getObjectInstanceName()
     {
-        return ObjectName.quote(getRemoteAddress());
+        return ObjectName.quote(getConfiguredObject().getName());
     }
 
     @Override
diff --git a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
index 8754f9a465..232094ce9e 100644
--- a/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
+++ b/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
@@ -159,9 +159,9 @@ public class ConnectionMBeanTest extends TestCase
 
     public void testGetObjectInstanceName()
     {
-        String remoteAddress = "testRemoteAddress";
-        String quotedRemoteAddress = "\"testRemoteAddress\"";
-        when(_mockConnection.getAttribute(Connection.REMOTE_ADDRESS)).thenReturn(remoteAddress);
+        String name = "[1] 127.0.0.1:5555";
+        String quotedRemoteAddress = "\"" + name +"\"";
+        when(_mockConnection.getName()).thenReturn(name);
         String objectInstanceName = _connectionMBean.getObjectInstanceName();
         assertEquals(quotedRemoteAddress, objectInstanceName);
     }
-- 
cgit v1.2.1