1 files changed, 13 insertions, 20 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java b/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
index f352bbdd2c..ff41536a23 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/state/AMQStateManager.java
@@ -31,10 +31,10 @@ import org.apache.qpid.framing.MethodDispatcher;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.protocol.AMQMethodEvent;
 import org.apache.qpid.protocol.AMQMethodListener;
+import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.registry.IApplicationRegistry;
 import org.apache.qpid.server.security.SecurityManager;
-import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
+import org.apache.qpid.server.security.SubjectCreator;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -47,32 +47,29 @@ public class AMQStateManager implements AMQMethodListener
 {
     private static final Logger _logger = Logger.getLogger(AMQStateManager.class);
 
-    private final VirtualHostRegistry _virtualHostRegistry;
+    private final Broker _broker;
     private final AMQProtocolSession _protocolSession;
     /** The current state */
     private AMQState _currentState;
 
     private CopyOnWriteArraySet<StateListener> _stateListeners = new CopyOnWriteArraySet<StateListener>();
 
-    public AMQStateManager(VirtualHostRegistry virtualHostRegistry, AMQProtocolSession protocolSession)
+    public AMQStateManager(Broker broker, AMQProtocolSession protocolSession)
     {
-
-        _virtualHostRegistry = virtualHostRegistry;
+        _broker = broker;
         _protocolSession = protocolSession;
         _currentState = AMQState.CONNECTION_NOT_STARTED;
 
     }
 
     /**
-     * Get the ApplicationRegistry associated with this AMQStateManager
-     *
-     * returns the application registry associated with the VirtualHostRegistry of the AMQStateManager
+     * Get the Broker instance
      *
-     * @return the ApplicationRegistry
+     * @return the Broker
      */
-    public IApplicationRegistry getApplicationRegistry()
+    public Broker getBroker()
     {
-        return _virtualHostRegistry.getApplicationRegistry();
+        return _broker;
     }
 
     public AMQState getCurrentState()
@@ -148,7 +145,7 @@ public class AMQStateManager implements AMQMethodListener
 
     public VirtualHostRegistry getVirtualHostRegistry()
     {
-        return _virtualHostRegistry;
+        return _broker.getVirtualHostRegistry();
     }
 
     public AMQProtocolSession getProtocolSession()
@@ -157,13 +154,9 @@ public class AMQStateManager implements AMQMethodListener
         return _protocolSession;
     }
 
-    /**
-     * Get the AuthenticationManager associated with the ProtocolSession of the AMQStateManager
-     *
-     * @return the AuthenticationManager
-     */
-    public AuthenticationManager getAuthenticationManager()
+    
+    public SubjectCreator getSubjectCreator()
     {
-        return getApplicationRegistry().getAuthenticationManager(getProtocolSession().getLocalAddress());
+        return _broker.getSubjectCreator(getProtocolSession().getLocalAddress());
     }
 }