1 files changed, 3 insertions, 0 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
index b39f975c28..cbb7cb8224 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
@@ -469,6 +469,9 @@ public class VirtualHostImpl implements VirtualHost, IConnectionRegistry.Registr
             }
         }
 
+        // clear exchange objects
+        _exchangeRegistry.clearAndUnregisterMbeans();
+
         _state = State.STOPPED;
 
         CurrentActor.get().message(VirtualHostMessages.CLOSED());