summaryrefslogtreecommitdiff
path: root/java/client
diff options
context:
space:
mode:
Diffstat (limited to 'java/client')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/AMQConnection.java3
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java6
2 files changed, 8 insertions, 1 deletions
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);
+ }
}