From 283741d2680b4fa43e3c0e4e02621d1a7a24e37c Mon Sep 17 00:00:00 2001 From: Robert Greig Date: Tue, 9 Jan 2007 23:46:48 +0000 Subject: QPID-270 : (Patch supplied by Rob Godfrey) Change of use of AMQConnectionException git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494655 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/src/main/java/org/apache/qpid/client/AMQConnection.java | 7 ++----- .../apache/qpid/test/unit/client/connection/ConnectionTest.java | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'java/client') diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java index a4d0065699..ca101cb3b5 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java @@ -21,10 +21,7 @@ package org.apache.qpid.client; import org.apache.log4j.Logger; -import org.apache.qpid.AMQConnectionException; -import org.apache.qpid.AMQException; -import org.apache.qpid.AMQUndeliveredException; -import org.apache.qpid.AMQUnresolvedAddressException; +import org.apache.qpid.*; import org.apache.qpid.client.failover.FailoverSupport; import org.apache.qpid.client.protocol.AMQProtocolHandler; import org.apache.qpid.client.state.AMQState; @@ -274,7 +271,7 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect message = "Unable to Connect"; } - AMQException e = new AMQConnectionException(message); + AMQException e = new AMQConnectionFailureException(message); if (lastException != null) { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java index c5aa62032c..0bfe8dbddf 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java @@ -26,6 +26,7 @@ import org.apache.qpid.client.transport.TransportConnection; import org.apache.qpid.AMQException; import org.apache.qpid.AMQConnectionException; import org.apache.qpid.AMQUnresolvedAddressException; +import org.apache.qpid.AMQConnectionFailureException; import javax.jms.Connection; @@ -88,7 +89,7 @@ public class ConnectionTest extends TestCase } catch (AMQException amqe) { - if (!(amqe instanceof AMQConnectionException)) + if (!(amqe instanceof AMQConnectionFailureException)) { fail("Correct exception not thrown. Excpected 'AMQConnectionException' got: " + amqe); } -- cgit v1.2.1