QPID-3949 : [Java AMQP 1.0] Fix descriptors on filters

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1326565 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 12 deletions

diff --git a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
index a068ca7a08..527e82eaed 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
+++ b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
@@ -18,26 +18,22 @@
  */

 package org.apache.qpid.amqp_1_0.jms.impl;

 

+import java.util.Collections;

+import java.util.Enumeration;

+import java.util.Map;

+import javax.jms.InvalidSelectorException;

+import javax.jms.JMSException;

 import org.apache.qpid.amqp_1_0.client.AcknowledgeMode;

 import org.apache.qpid.amqp_1_0.client.Message;

 import org.apache.qpid.amqp_1_0.client.Receiver;

 import org.apache.qpid.amqp_1_0.jms.QueueBrowser;

 import org.apache.qpid.amqp_1_0.type.AmqpErrorException;

-import org.apache.qpid.amqp_1_0.type.Binary;

-import org.apache.qpid.amqp_1_0.type.DistributionMode;

-import org.apache.qpid.amqp_1_0.type.Outcome;

 import org.apache.qpid.amqp_1_0.type.Symbol;

 import org.apache.qpid.amqp_1_0.type.messaging.Filter;

 import org.apache.qpid.amqp_1_0.type.messaging.JMSSelectorFilter;

 import org.apache.qpid.amqp_1_0.type.messaging.StdDistMode;

 import org.apache.qpid.amqp_1_0.type.transport.AmqpError;

 

-import javax.jms.InvalidSelectorException;

-import javax.jms.JMSException;

-import java.util.Collections;

-import java.util.Enumeration;

-import java.util.Map;

-

 public class QueueBrowserImpl implements QueueBrowser

 {

     private static final String JMS_SELECTOR = "jms-selector";

@@ -77,9 +73,7 @@ public class QueueBrowserImpl implements QueueBrowser
         catch(AmqpErrorException e)

         {

             org.apache.qpid.amqp_1_0.type.transport.Error error = e.getError();

-            if(AmqpError.INVALID_FIELD.equals(error.getCondition())

-               &&  error.getInfo() != null && Symbol.valueOf("filter").equals(error.getInfo().get(Symbol.valueOf

-                    ("field"))))

+            if(AmqpError.INVALID_FIELD.equals(error.getCondition()))

             {

                 throw new InvalidSelectorException(e.getMessage());

             }