Author: rgodfrey
Date: Mon Apr 16 12:05:52 2012
New Revision: 1326565
URL: http://svn.apache.org/viewvc?rev=1326565&view=rev
Log:
QPID-3949 : [Java AMQP 1.0] Fix descriptors on filters
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java?rev=1326565&r1=1326564&r2=1326565&view=diff
==============================================================================
---
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
(original)
+++
qpid/trunk/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/QueueBrowserImpl.java
Mon Apr 16 12:05:52 2012
@@ -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
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());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
