From 5202ea9585fe42f21b030a34204035fa4650c2f1 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Tue, 2 Jun 2009 15:31:32 +0000 Subject: removed another turnary if git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@781061 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qpid/messaging.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qpid/python') diff --git a/qpid/python/qpid/messaging.py b/qpid/python/qpid/messaging.py index 43dc3360f7..e7272873c8 100644 --- a/qpid/python/qpid/messaging.py +++ b/qpid/python/qpid/messaging.py @@ -551,7 +551,10 @@ class Sender(Lockable): else: message = Message(object) # XXX: what if subject is specified for a normal queue? - rk = message.subject if self._routing_key is None else self._routing_key + if self._routing_key is None: + rk = message.subject + else: + rk = self._routing_key # XXX: do we need to query to figure out how to create the reply-to interoperably? rt = self._ssn.reply_to(*parse_addr(message.reply_to)) if message.reply_to else None dp = self._ssn.delivery_properties(routing_key=rk) -- cgit v1.2.1