1 files changed, 15 insertions, 2 deletions
diff --git a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
index c7aade34b4..cce38d26b1 100644
--- a/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
+++ b/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
@@ -27,9 +27,11 @@ import org.apache.qpid.management.common.mbeans.annotations.MBeanDescription;
 import org.apache.qpid.server.jmx.AMQManagedObject;
 import org.apache.qpid.server.jmx.ManagedObject;
 import org.apache.qpid.server.jmx.ManagedObjectRegistry;
+import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
 
 import javax.management.JMException;
+import javax.management.ObjectName;
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.CompositeDataSupport;
 import javax.management.openmbean.CompositeType;
@@ -51,6 +53,9 @@ public class UserManagementMBean extends AMQManagedObject implements UserManagem
 
     private PasswordCredentialManagingAuthenticationProvider _authProvider;
 
+    private String _mbeanName;
+    private String _type;
+
     // Setup for the TabularType
     private static final TabularType _userlistDataType; // Datatype for representing User Lists
     private static final CompositeType _userDataType; // Composite type for representing User
@@ -81,14 +86,16 @@ public class UserManagementMBean extends AMQManagedObject implements UserManagem
     public UserManagementMBean(PasswordCredentialManagingAuthenticationProvider provider, ManagedObjectRegistry registry) throws JMException
     {
         super(UserManagement.class, UserManagement.TYPE, registry);
-        register();
         _authProvider = provider;
+        _mbeanName = UserManagement.TYPE + "-" + _authProvider.getName();
+        _type = String.valueOf(_authProvider.getAttribute(AuthenticationProvider.TYPE));
+        register();
     }
 
     @Override
     public String getObjectInstanceName()
     {
-        return UserManagement.TYPE;
+        return ObjectName.quote(_mbeanName);
     }
 
     @Override
@@ -176,4 +183,10 @@ public class UserManagementMBean extends AMQManagedObject implements UserManagem
     {
         return null;
     }
+
+    @Override
+    public String getAuthenticationProviderType()
+    {
+        return _type;
+    }
 }