QPID-2575 : Create Connection and Session models to correctly expose the Owning Session. Addressed issue where getPrincipal was used in error to identify queue owner. Session model now allows access to this in a protocol independent way.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
index dbd51af68c..f02b1f435f 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
@@ -30,6 +30,7 @@ import org.apache.qpid.server.management.ManagedObject;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.security.PrincipalHolder;
 import org.apache.qpid.server.AMQChannel;
+import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.binding.Binding;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.AMQException;
@@ -47,7 +48,7 @@ public class MockAMQQueue implements AMQQueue
 
     private PrincipalHolder _principalHolder;
 
-    private Object _exclusiveOwner;
+    private AMQSessionModel _exclusiveOwner;
 
     public MockAMQQueue(String name)
     {
@@ -527,12 +528,12 @@ public class MockAMQQueue implements AMQQueue
         _principalHolder = principalHolder;
     }
 
-    public Object getExclusiveOwner()
+    public AMQSessionModel getExclusiveOwningSession()
     {
         return _exclusiveOwner;
     }
 
-    public void setExclusiveOwner(Object exclusiveOwner)
+    public void setExclusiveOwningSession(AMQSessionModel exclusiveOwner)
     {
         _exclusiveOwner = exclusiveOwner;
     }