1 files changed, 25 insertions, 22 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
index bb9c22f31a..f627d94419 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
@@ -24,8 +24,6 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.url.URLSyntaxException;
 
@@ -44,37 +42,42 @@ public class CloseAfterConnectionFailureTest extends QpidTestCase implements Exc
     private CountDownLatch _latch = new CountDownLatch(1);
     private JMSException _fail;
 
-    public void testNoFailover() throws URLSyntaxException, AMQVMBrokerCreationException,
+    public void testNoFailover() throws URLSyntaxException, Exception,
                                         InterruptedException, JMSException
     {
-        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='500',retries='3'',failover='nofailover'";
+        //This test uses hard coded connection string so only runs on InVM case
+        if (!isExternalBroker())
+        {
+            String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='500',retries='3'',failover='nofailover'";
 
-        AMQConnectionURL url = new AMQConnectionURL(connectionString);
+            AMQConnectionURL url = new AMQConnectionURL(connectionString);
 
-        try
-        {
-            //Start the connection so it will use the retries
-            connection = new AMQConnection(url, null);
+            try
+            {
+                //Start the connection so it will use the retries
+                connection = new AMQConnection(url, null);
 
-            connection.setExceptionListener(this);
+                connection.setExceptionListener(this);
 
-            session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            consumer = session.createConsumer(session.createQueue(this.getName()));
+                session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+                consumer = session.createConsumer(session.createQueue(this.getName()));
 
-            //Kill connection
-            TransportConnection.killAllVMBrokers();
-            _latch.await();
+                //Kill connection
+                stopBroker();
 
-            if (_fail != null)
+                _latch.await();
+
+                if (_fail != null)
+                {
+                    _fail.printStackTrace(System.out);
+                    fail("Exception thrown:" + _fail.getMessage());
+                }
+            }
+            catch (AMQException e)
             {
-                _fail.printStackTrace(System.out);
-                fail("Exception thrown:" + _fail.getMessage());
+                fail(e.getMessage());
             }
         }
-        catch (AMQException e)
-        {
-            fail(e.getMessage());
-        }
     }
 
     public void onException(JMSException e)