1 files changed, 7 insertions, 7 deletions

diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
index f267794796..6dc8fc12b5 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/TopicSubscriberImpl.java
@@ -18,18 +18,18 @@
  */

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

 

+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.ConnectionErrorException;

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

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

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

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

-import org.apache.qpid.amqp_1_0.type.transport.*;

-

-import javax.jms.*;

-import java.util.Map;

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

 

 public class TopicSubscriberImpl extends MessageConsumerImpl implements TopicSubscriber

 {

@@ -96,9 +96,9 @@ public class TopicSubscriberImpl extends MessageConsumerImpl implements TopicSub
 

             return receiver;

         }

-        catch (AmqpErrorException e)

+        catch (ConnectionErrorException e)

         {

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

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

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

             {

                 throw new InvalidSelectorException(e.getMessage());