From ebb1c7b36f8b2756b686bf162e45c45d0d56f3ee Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 26 Jan 2010 20:53:24 +0000 Subject: fixed subject override git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903410 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/driver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'python/qpid/driver.py') diff --git a/python/qpid/driver.py b/python/qpid/driver.py index 7d203de588..1e295dd42f 100644 --- a/python/qpid/driver.py +++ b/python/qpid/driver.py @@ -839,11 +839,10 @@ class Driver: sst = self._attachments[snd.session] _snd = self._attachments[snd] - # XXX: what if subject is specified for a normal queue? - if _snd._routing_key is None: - rk = msg.subject - else: + if msg.subject is None or _snd._exchange == "": rk = _snd._routing_key + else: + rk = msg.subject # XXX: do we need to query to figure out how to create the reply-to interoperably? if msg.reply_to: rt = addr2reply_to(msg.reply_to) -- cgit v1.2.1