From 5eaec09f70364e89102f020846cb31336683a798 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 13 Feb 2012 01:07:26 +0000
Subject: 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/qpid@1243389 13f79535-47bb-0310-9956-ffa450edef68
---
 .../client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java | 4 ++--
 java/client/src/main/java/org/apache/qpid/client/AMQSession.java     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'java/client')

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java b/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
index 465d858091..2313bce474 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
+++ b/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/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 49447189b6..ac728e78eb 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/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)
-- 
cgit v1.2.1