diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-02-13 01:07:26 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-02-13 01:07:26 +0000 |
| commit | df93882054260363472731addb30fa99673b9a05 (patch) | |
| tree | 1a81ae8aff4d446f5ca923f00c0541d135a25e68 | |
| parent | 943b467190d5d593bd9e92a5e42717aa9a24b143 (diff) | |
| download | qpid-python-df93882054260363472731addb30fa99673b9a05.tar.gz | |
QPID-3817: remove unnecessary cast to AMQQueue from the QueueBrowser creation path to allow their use with Address syntax 'destination.<address>' entries in JNDI properties files.
Applied patch from Praveen Murugesan
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243389 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java | 4 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java index 465d858091..2313bce474 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java @@ -39,11 +39,11 @@ public class AMQQueueBrowser implements QueueBrowser private AtomicBoolean _isClosed = new AtomicBoolean(); private final AMQSession _session; - private final AMQQueue _queue; + private final Queue _queue; private final ArrayList<BasicMessageConsumer> _consumers = new ArrayList<BasicMessageConsumer>(); private final String _messageSelector; - AMQQueueBrowser(AMQSession session, AMQQueue queue, String messageSelector) throws JMSException + AMQQueueBrowser(AMQSession session, Queue queue, String messageSelector) throws JMSException { _session = session; _queue = queue; diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 49447189b6..ac728e78eb 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -952,6 +952,9 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic return createBrowser(queue, null); } + /** + * Create a queue browser if the destination is a valid queue. + */ public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException { if (isStrictAMQP()) @@ -962,7 +965,7 @@ public abstract class AMQSession<C extends BasicMessageConsumer, P extends Basic checkNotClosed(); checkValidQueue(queue); - return new AMQQueueBrowser(this, (AMQQueue) queue, messageSelector); + return new AMQQueueBrowser(this, queue, messageSelector); } protected MessageConsumer createBrowserConsumer(Destination destination, String messageSelector, boolean noLocal) |