summaryrefslogtreecommitdiff
path: root/java/client/src
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2010-07-22 14:22:01 +0000
committerMartin Ritchie <ritchiem@apache.org>2010-07-22 14:22:01 +0000
commit4a3228c8799af99f073d8a1e215058d23a6eb0da (patch)
treefd8213d1c54b29c902d98de3b28ac929286937b9 /java/client/src
parent7a43da08f8cc070bb252ea62eadc59abde92995c (diff)
downloadqpid-python-4a3228c8799af99f073d8a1e215058d23a6eb0da.tar.gz
Cleanup M2.x merge code
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@966681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/client/src')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java14
1 files changed, 3 insertions, 11 deletions
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 a4f8bb0166..8e4b59910c 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
@@ -52,7 +52,7 @@ public class TransportConnection
{
private static ITransportConnection _instance;
- private static Map _inVmPipeAddress = new HashMap();
+ private static final Map _inVmPipeAddress = new HashMap();
private static VmPipeAcceptor _acceptor;
private static int _currentInstance = -1;
private static int _currentVMPort = -1;
@@ -177,16 +177,8 @@ public class TransportConnection
{
if (AutoCreate)
{
- if (AutoCreate)
- {
- _logger.warn("Auto Creating InVM Broker on port:" + port);
- createVMBroker(port);
- }
- else
- {
- throw new AMQVMBrokerCreationException(null, port, "VM Broker on port " + port
- + " does not exist. Auto create disabled.", null);
- }
+ _logger.warn("Auto Creating InVM Broker on port:" + port);
+ createVMBroker(port);
}
else
{