1 files changed, 16 insertions, 18 deletions

diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
index 3c15c74d6f..def5ae5931 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageConsumerImpl.java
@@ -18,18 +18,30 @@
  */

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

 

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import javax.jms.Destination;

+import javax.jms.IllegalStateException;

+import javax.jms.InvalidDestinationException;

+import javax.jms.InvalidSelectorException;

+import javax.jms.JMSException;

+import javax.jms.MessageListener;

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

+import org.apache.qpid.amqp_1_0.client.ConnectionErrorException;

 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.client.Transaction;

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

-import org.apache.qpid.amqp_1_0.jms.QueueReceiver;

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

+import org.apache.qpid.amqp_1_0.jms.QueueReceiver;

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

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

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

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

-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.Symbol;

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

@@ -40,20 +52,6 @@ import org.apache.qpid.amqp_1_0.type.messaging.NoLocalFilter;
 import org.apache.qpid.amqp_1_0.type.transport.AmqpError;

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

 

-

-import javax.jms.Destination;

-import javax.jms.IllegalStateException;

-import javax.jms.InvalidDestinationException;

-import javax.jms.InvalidSelectorException;

-import javax.jms.JMSException;

-import javax.jms.MessageListener;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-

 public class MessageConsumerImpl implements MessageConsumer, QueueReceiver, TopicSubscriber

 {

     private static final Symbol NO_LOCAL_FILTER_NAME = Symbol.valueOf("no-local");

@@ -130,9 +128,9 @@ public class MessageConsumerImpl implements MessageConsumer, QueueReceiver, Topi
             return _session.getClientSession(). createReceiver(_session.toAddress(_destination), AcknowledgeMode.ALO,

                                                                _linkName, _durable, getFilters(), null);

         }

-        catch (AmqpErrorException e)

+        catch (ConnectionErrorException e)

         {

-            Error error = e.getError();

+            Error error = e.getRemoteError();

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

             {

                 throw new InvalidSelectorException(e.getMessage());