From f0f34d8914a623dc6fe42038ca443ea560a64a28 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Mon, 12 May 2008 20:19:50 +0000 Subject: More fixing up of refactoring stuff; getting all maven tests passing and implementing management methods git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@655630 13f79535-47bb-0310-9956-ffa450edef68 --- java/client/src/main/java/org/apache/qpid/client/AMQConnection.java | 3 ++- .../java/org/apache/qpid/client/transport/TransportConnection.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (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 60f57aaf0e..ad611b217a 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 @@ -538,7 +538,8 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect try { - TransportConnection.getInstance(brokerDetail).connect(_protocolHandler, brokerDetail); + TransportConnection.connect(_protocolHandler,brokerDetail); + // this blocks until the connection has been set up or when an error // has prevented the connection being set up diff --git a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java index 5907bd90af..a4e9191982 100644 --- a/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java +++ b/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java @@ -29,6 +29,7 @@ import org.apache.mina.transport.socket.nio.SocketConnector; import org.apache.mina.transport.vmpipe.VmPipeAcceptor; import org.apache.mina.transport.vmpipe.VmPipeAddress; import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException; +import org.apache.qpid.client.protocol.AMQProtocolHandler; import org.apache.qpid.jms.BrokerDetails; import org.apache.qpid.pool.ReadWriteThreadModel; import org.slf4j.Logger; @@ -346,4 +347,9 @@ public class TransportConnection } } + public static synchronized void connect(final AMQProtocolHandler protocolHandler, final BrokerDetails brokerDetail) + throws AMQTransportConnectionException, IOException + { + getInstance(brokerDetail).connect(protocolHandler, brokerDetail); + } } -- cgit v1.2.1