qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1463177 - in /qpid/branches/0.22/qpid: ./ cpp/src/ cpp/src/qpid/broker/ cpp/src/qpid/broker/amqp/Session.cpp
Date Mon, 01 Apr 2013 16:09:36 GMT
Author: gsim
Date: Mon Apr  1 16:09:36 2013
New Revision: 1463177

URL: http://svn.apache.org/r1463177
Log:
QPID-4675: Allow receivers from direct exchanges without a subject filter. Merged from r1462139.

Modified:
    qpid/branches/0.22/qpid/   (props changed)
    qpid/branches/0.22/qpid/cpp/src/   (props changed)
    qpid/branches/0.22/qpid/cpp/src/qpid/broker/   (props changed)
    qpid/branches/0.22/qpid/cpp/src/qpid/broker/amqp/Session.cpp

Propchange: qpid/branches/0.22/qpid/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid:r1462139

Propchange: qpid/branches/0.22/qpid/cpp/src/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/src:r1462139

Propchange: qpid/branches/0.22/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
  Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1462139

Modified: qpid/branches/0.22/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1463177&r1=1463176&r2=1463177&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/branches/0.22/qpid/cpp/src/qpid/broker/amqp/Session.cpp Mon Apr  1 16:09:36 2013
@@ -235,12 +235,10 @@ void Session::setupOutgoing(pn_link_t* l
         if (filter.hasSubjectFilter()) {
             filter.bind(node.exchange, queue);
             filter.write(pn_terminus_filter(pn_link_source(link)));
-        } else if (node.exchange->getType() == FanOutExchange::typeName) {
-            node.exchange->bind(queue, std::string(), 0);
         } else if (node.exchange->getType() == TopicExchange::typeName) {
             node.exchange->bind(queue, "#", 0);
         } else {
-            throw qpid::Exception("Exchange type requires a filter: " + node.exchange->getType());/*not-supported?*/
+            node.exchange->bind(queue, std::string(), 0);
         }
         boost::shared_ptr<Outgoing> q(new OutgoingFromQueue(broker, name, target, queue,
link, *this, out, true));
         outgoing[link] = q;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message