QPID-4639: Add UI to add/delete virtual hosts into java broker web management console

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

1 files changed, 17 insertions, 2 deletions

diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
index d725dc4dc3..3342aea4fb 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java
@@ -297,12 +297,27 @@ public class JMXManagement extends AbstractPluginAdapter implements Configuratio
                     }
                     catch(JMException e)
                     {
-                        LOGGER.error("Error creating mbean", e);
+                        LOGGER.error("Error unregistering user management mbean: " + child.getName(), e);
+                        //TODO - report error on removing child MBean
+                    }
+                }
+            }
+            else if (child instanceof VirtualHost)
+            {
+                AMQManagedObject mbean = _children.remove(child);
+                if(mbean != null)
+                {
+                    try
+                    {
+                        mbean.unregister();
+                    }
+                    catch(JMException e)
+                    {
+                        LOGGER.error("Error unregistering virtual host mbean :" + child.getName(), e);
                         //TODO - report error on removing child MBean
                     }
                 }
             }
-
         }
     }