Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 5414 invoked from network); 5 Jan 2009 20:58:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2009 20:58:35 -0000 Received: (qmail 58570 invoked by uid 500); 5 Jan 2009 20:58:35 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 58560 invoked by uid 500); 5 Jan 2009 20:58:35 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 58551 invoked by uid 99); 5 Jan 2009 20:58:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 12:58:35 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2009 20:58:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9508123889D2; Mon, 5 Jan 2009 12:58:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731717 - /qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp Date: Mon, 05 Jan 2009 20:58:12 -0000 To: commits@qpid.apache.org From: gsim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090105205812.9508123889D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gsim Date: Mon Jan 5 12:58:12 2009 New Revision: 731717 URL: http://svn.apache.org/viewvc?rev=731717&view=rev Log: Sorry! Carelessly committed more than I wanted to. Reverting part of my previous commit. Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp?rev=731717&r1=731716&r2=731717&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.cpp Mon Jan 5 12:58:12 2009 @@ -33,7 +33,6 @@ const std::string qpidFedOp("qpid.fed.op"); const std::string qpidFedTags("qpid.fed.tags"); const std::string qpidFedOrigin("qpid.fed.origin"); -const std::string qpidExclusiveBinding("qpid.exclusive-binding"); const std::string fedOpBind("B"); const std::string fedOpUnbind("U"); @@ -57,25 +56,15 @@ bool DirectExchange::bind(Queue::shared_ptr queue, const string& routingKey, const FieldTable* args) { - string fedOp(fedOpBind); - string fedTags; - string fedOrigin; - bool exclusiveBinding = false; - if (args) { - fedOp = args->getAsString(qpidFedOp); - fedTags = args->getAsString(qpidFedTags); - fedOrigin = args->getAsString(qpidFedOrigin); - exclusiveBinding = args->get(qpidExclusiveBinding); - } - + string fedOp(args ? args->getAsString(qpidFedOp) : fedOpBind); + string fedTags(args ? args->getAsString(qpidFedTags) : ""); + string fedOrigin(args ? args->getAsString(qpidFedOrigin) : ""); bool propagate = false; if (args == 0 || fedOp.empty() || fedOp == fedOpBind) { Mutex::ScopedLock l(lock); Binding::shared_ptr b(new Binding(routingKey, queue, this, FieldTable(), fedOrigin)); BoundKey& bk = bindings[routingKey]; - if (exclusiveBinding) bk.queues.clear(); - if (bk.queues.add_unless(b, MatchQueue(queue))) { propagate = bk.fedBinding.addOrigin(fedOrigin); if (mgmtExchange != 0) {