QPID-4712: authorisation for AMQP 1.0 connections

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

1 files changed, 1 insertions, 6 deletions

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index e1782b01ce..c402e3e016 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -220,18 +220,13 @@ Queue::~Queue()
 {
 }
 
-bool isLocalTo(const OwnershipToken* token, const Message& msg)
-{
-    return token && token->isLocal(msg.getPublisherOwnership());
-}
-
 bool Queue::isLocal(const Message& msg)
 {
     //message is considered local if it was published on the same
     //connection as that of the session which declared this queue
     //exclusive (owner) or which has an exclusive subscription
     //(exclusive)
-    return settings.noLocal && (isLocalTo(owner, msg) || isLocalTo(exclusive, msg));
+    return settings.noLocal && (msg.isLocalTo(owner) || msg.isLocalTo(exclusive));
 }
 
 bool Queue::isExcluded(const Message& msg)