1 files changed, 12 insertions, 11 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ACLManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ACLManager.java
index 6f7f66fad2..c53403d0df 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ACLManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ACLManager.java
@@ -41,6 +41,7 @@ import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.security.access.ACLPlugin.AuthzResult;
 import org.apache.qpid.server.security.access.plugins.SimpleXML;
 import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.PrincipalHolder;
 
 public class ACLManager
 {
@@ -152,7 +153,7 @@ public class ACLManager
         return true;
     }
 
-    public boolean authoriseBind(final AMQProtocolSession session, final Exchange exch, final AMQQueue queue,
+    public boolean authoriseBind(final PrincipalHolder session, final Exchange exch, final AMQQueue queue,
             final AMQShortString routingKey)
     {
         return checkAllPlugins(new AccessCheck()
@@ -167,7 +168,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseConnect(final AMQProtocolSession session, final VirtualHost virtualHost)
+    public boolean authoriseConnect(final PrincipalHolder session, final VirtualHost virtualHost)
     {
         return checkAllPlugins(new AccessCheck()
         {
@@ -181,7 +182,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseConsume(final AMQProtocolSession session, final boolean noAck, final AMQQueue queue)
+    public boolean authoriseConsume(final PrincipalHolder session, final boolean noAck, final AMQQueue queue)
     {
         return checkAllPlugins(new AccessCheck()
         {
@@ -195,7 +196,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseConsume(final AMQProtocolSession session, final boolean exclusive, final boolean noAck,
+    public boolean authoriseConsume(final PrincipalHolder session, final boolean exclusive, final boolean noAck,
             final boolean noLocal, final boolean nowait, final AMQQueue queue)
     {
         return checkAllPlugins(new AccessCheck()
@@ -210,7 +211,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseCreateExchange(final AMQProtocolSession session, final boolean autoDelete,
+    public boolean authoriseCreateExchange(final PrincipalHolder session, final boolean autoDelete,
             final boolean durable, final AMQShortString exchangeName, final boolean internal, final boolean nowait,
             final boolean passive, final AMQShortString exchangeType)
     {
@@ -227,7 +228,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseCreateQueue(final AMQProtocolSession session, final boolean autoDelete,
+    public boolean authoriseCreateQueue(final PrincipalHolder session, final boolean autoDelete,
             final boolean durable, final boolean exclusive, final boolean nowait, final boolean passive,
             final AMQShortString queue)
     {
@@ -243,7 +244,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseDelete(final AMQProtocolSession session, final AMQQueue queue)
+    public boolean authoriseDelete(final PrincipalHolder session, final AMQQueue queue)
     {
         return checkAllPlugins(new AccessCheck()
         {
@@ -257,7 +258,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseDelete(final AMQProtocolSession session, final Exchange exchange)
+    public boolean authoriseDelete(final PrincipalHolder session, final Exchange exchange)
     {
         return checkAllPlugins(new AccessCheck()
         {
@@ -271,7 +272,7 @@ public class ACLManager
         });
     }
     
-    public boolean authorisePublish(final AMQProtocolSession session, final boolean immediate, final boolean mandatory,
+    public boolean authorisePublish(final PrincipalHolder session, final boolean immediate, final boolean mandatory,
             final AMQShortString routingKey, final Exchange e)
     {
         return checkAllPlugins(new AccessCheck()
@@ -286,7 +287,7 @@ public class ACLManager
         });
     }
 
-    public boolean authorisePurge(final AMQProtocolSession session, final AMQQueue queue)
+    public boolean authorisePurge(final PrincipalHolder session, final AMQQueue queue)
     {
         return checkAllPlugins(new AccessCheck()
         {
@@ -300,7 +301,7 @@ public class ACLManager
         });
     }
 
-    public boolean authoriseUnbind(final AMQProtocolSession session, final Exchange exch,
+    public boolean authoriseUnbind(final PrincipalHolder session, final Exchange exch,
             final AMQShortString routingKey, final AMQQueue queue)
     {
         return checkAllPlugins(new AccessCheck()