From 36cfeb13b8ad4b532f7f9c2b48ac2353e6217bcd Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Mon, 31 Mar 2008 12:51:36 +0000
Subject: Re-introduced old 'no-local' behaviour for exclusive queues via a
 proprietary arg to queue.declare.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@642981 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/broker/Queue.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'cpp/src/qpid/broker/Queue.cpp')

diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 165830151d..436431fce1 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -59,6 +59,7 @@ Queue::Queue(const string& _name, bool _autodelete,
     owner(_owner), 
     consumerCount(0),
     exclusive(false),
+    noLocal(false),
     persistenceId(0)
 {
     if (parent != 0)
@@ -90,6 +91,10 @@ void Queue::notifyDurableIOComplete()
     notify();
 }
 
+bool Queue::isLocal(boost::intrusive_ptr<Message>& msg)
+{
+    return noLocal && owner && owner->isLocal(msg->getPublisher());
+}
 
 void Queue::deliver(boost::intrusive_ptr<Message>& msg){
     if (msg->isImmediate() && getConsumerCount() == 0) {
@@ -97,9 +102,10 @@ void Queue::deliver(boost::intrusive_ptr<Message>& msg){
             DeliverableMessage deliverable(msg);
             alternateExchange->route(deliverable, msg->getRoutingKey(), msg->getApplicationHeaders());
         }
+    } else if (isLocal(msg)) {
+        //drop message
+        QPID_LOG(debug, "Dropping 'local' message from " << getName());
     } else {
-
-
         // if no store then mark as enqueued
         if (!enqueue(0, msg)){
             push(msg);
@@ -468,6 +474,7 @@ namespace
 {
     const std::string qpidMaxSize("qpid.max_size");
     const std::string qpidMaxCount("qpid.max_count");
+    const std::string qpidNoLocal("no-local");
 }
 
 void Queue::create(const FieldTable& _settings)
@@ -484,8 +491,13 @@ void Queue::create(const FieldTable& _settings)
 void Queue::configure(const FieldTable& _settings)
 {
     std::auto_ptr<QueuePolicy> _policy(new QueuePolicy(_settings));
-    if (_policy->getMaxCount() || _policy->getMaxSize()) 
+    if (_policy->getMaxCount() || _policy->getMaxSize()) {
         setPolicy(_policy);
+    }    
+    if (owner) {
+        noLocal = _settings.get(qpidNoLocal);
+        QPID_LOG(debug, "Configured queue with no-local=" << noLocal);
+    }
 }
 
 void Queue::destroy()
-- 
cgit v1.2.1