Author: cctrieloff
Date: Mon Aug 27 14:02:11 2007
New Revision: 570243
URL: http://svn.apache.org/viewvc?rev=570243&view=rev
Log:
- perf clean up.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp?rev=570243&r1=570242&r2=570243&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerAdapter.cpp Mon Aug 27
14:02:11 2007
@@ -80,7 +80,6 @@
void BrokerAdapter::ExchangeHandlerImpl::declare(uint16_t /*ticket*/, const
string& exchange, const string& type,
const string&
alternateExchange,
bool passive, bool durable,
bool /*autoDelete*/, const FieldTable& args){
-
Exchange::shared_ptr alternate;
if (!alternateExchange.empty()) {
alternate = broker.getExchanges().get(alternateExchange);
@@ -198,6 +197,7 @@
void BrokerAdapter::QueueHandlerImpl::declare(uint16_t /*ticket*/, const
string& name, const string& alternateExchange,
bool passive, bool durable, bool
exclusive,
bool autoDelete, const
qpid::framing::FieldTable& arguments){
+
Exchange::shared_ptr alternate;
if (!alternateExchange.empty()) {
alternate = broker.getExchanges().get(alternateExchange);
@@ -345,14 +345,11 @@
bool rejectUnroutable, bool immediate)
{
- Exchange::shared_ptr exchange = exchangeName.empty() ?
broker.getExchanges().getDefault() : broker.getExchanges().get(exchangeName);
- if(exchange){
- BasicMessage* msg = new BasicMessage(&connection, exchangeName,
routingKey, rejectUnroutable, immediate);
- channel.handlePublish(msg);
- }else{
- throw ChannelException(
- 404, "Exchange not found '" + exchangeName + "'");
- }
+ // exeption moved to ChannelAdaptor -- TODO this code should be removed
once basic is removed
+
+ BasicMessage* msg = new BasicMessage(&connection, exchangeName,
routingKey, rejectUnroutable, immediate);
+ channel.handlePublish(msg);
+
}
void BrokerAdapter::BasicHandlerImpl::get(uint16_t /*ticket*/, const string&
queueName, bool noAck){
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp?rev=570243&r1=570242&r2=570243&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerChannel.cpp Mon Aug 27
14:02:11 2007
@@ -346,7 +346,9 @@
cacheExchange =
connection.broker.getExchanges().get(routeToExchangeName);
}
- assert(cacheExchange.get());
+ if (!cacheExchange.get() )
+ throw ChannelException(404, "Exchange not found '" +
routeToExchangeName + "'");
+
cacheExchange->route(strategy, msg->getRoutingKey(),
&(msg->getApplicationHeaders()));
if (!strategy.delivered) {
