summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2008-01-17 13:04:56 +0000
committerGordon Sim <gsim@apache.org>2008-01-17 13:04:56 +0000
commitadab8d6fc99210863b6234fe74d85af900c0035c (patch)
tree87bb97364cbb4135088243ee9ec0cdfe94d4b979
parentee1d929ae412a72b6e125717bab546bb475e8682 (diff)
downloadqpid-python-adab8d6fc99210863b6234fe74d85af900c0035c.tar.gz
Set the exchange field in delivery properties on the broker.
(required an adjustment to the size of messages in the bytes based credit test) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@612805 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qpid/broker/SemanticState.cpp1
-rw-r--r--qpid/python/tests_0-10/message.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
index 9233685800..7b4035604f 100644
--- a/qpid/cpp/src/qpid/broker/SemanticState.cpp
+++ b/qpid/cpp/src/qpid/broker/SemanticState.cpp
@@ -350,6 +350,7 @@ void SemanticState::handle(intrusive_ptr<Message> msg) {
void SemanticState::route(intrusive_ptr<Message> msg, Deliverable& strategy) {
std::string exchangeName = msg->getExchangeName();
+ msg->getProperties<DeliveryProperties>()->setExchange(exchangeName);
if (!cacheExchange || cacheExchange->getName() != exchangeName){
cacheExchange = session.getConnection().broker.getExchanges().get(exchangeName);
}
diff --git a/qpid/python/tests_0-10/message.py b/qpid/python/tests_0-10/message.py
index fbd3d255de..1daaad9ba1 100644
--- a/qpid/python/tests_0-10/message.py
+++ b/qpid/python/tests_0-10/message.py
@@ -480,7 +480,7 @@ class MessageTests(TestBase):
channel.message_transfer(content=Content(properties={'routing_key' : "q"}, body = "abcdefgh"))
#each message is currently interpreted as requiring msg_size bytes of credit
- msg_size = 34
+ msg_size = 35
#set byte credit to finite amount (less than enough for all messages)
channel.message_flow(unit = 1, value = msg_size*5, destination = "c")