From b560997005f32b15e98c5743d96eaa2a4542d9fc Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Sun, 11 Oct 2009 16:54:18 +0000 Subject: fixed subscription to use subject if present git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@824105 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qpid/driver.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'qpid/python') diff --git a/qpid/python/qpid/driver.py b/qpid/python/qpid/driver.py index 13861aa215..7c293fe146 100644 --- a/qpid/python/qpid/driver.py +++ b/qpid/python/qpid/driver.py @@ -546,11 +546,18 @@ class Driver: else: _rcv._queue = "%s.%s" % (rcv.session.name, rcv.destination) sst.write_cmd(QueueDeclare(queue=_rcv._queue, durable=DURABLE_DEFAULT, exclusive=True, auto_delete=True)) - # XXX - if _rcv.options.get("filter") is None: + filter = _rcv.options.get("filter") + if _rcv.subject is None and filter is None: f = FILTER_DEFAULTS[result.type] + elif _rcv.subject and filter: + # XXX + raise Exception("can't supply both subject and filter") + elif _rcv.subject: + # XXX + from messaging import Pattern + f = Pattern(_rcv.subject) else: - f = rcv.filter + f = filter f._bind(sst, _rcv.name, _rcv._queue) do_link() sst.write_query(ExchangeQuery(name=_rcv.name), do_exchange_q) -- cgit v1.2.1