2 files changed, 7 insertions, 6 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
index 9ca11abb56..8cc747200f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
@@ -112,8 +112,8 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
 
 
         _codecFactory = codecFactory;
-        _managedObject = createMBean();
-        _managedObject.register();
+
+
 //        this(session, queueRegistry, exchangeRegistry, codecFactory, new AMQStateManager());
     }
 
@@ -127,8 +127,7 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
         
 
         _codecFactory = codecFactory;
-        _managedObject = createMBean();
-        _managedObject.register();
+
     }
 
     private AMQProtocolSessionMBean createMBean() throws AMQException
@@ -567,9 +566,11 @@ public class AMQMinaProtocolSession implements AMQProtocolSession,
         return _virtualHost;
     }
 
-    public void setVirtualHost(VirtualHost virtualHost)
+    public void setVirtualHost(VirtualHost virtualHost) throws AMQException
     {
         _virtualHost = virtualHost;
+        _managedObject = createMBean();
+        _managedObject.register();
     }
 
     public void addSessionCloseTask(Task task)
diff --git a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
index ee7e46eba4..48c05058b0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
@@ -137,7 +137,7 @@ public interface AMQProtocolSession extends AMQProtocolWriter
 
     VirtualHost getVirtualHost();
 
-    void setVirtualHost(VirtualHost virtualHost);
+    void setVirtualHost(VirtualHost virtualHost) throws AMQException;
 
     void addSessionCloseTask(Task task);