diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2010-07-22 14:22:01 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2010-07-22 14:22:01 +0000 |
| commit | a715cbe868e3834edb13c7baf3b98546c15a219e (patch) | |
| tree | 5ed1ce2ceea895845374d0139137fa6cb0568b7b /qpid/java | |
| parent | 7cecf190a22f70317bc8f79b2770c04565d3ee84 (diff) | |
| download | qpid-python-a715cbe868e3834edb13c7baf3b98546c15a219e.tar.gz | |
Cleanup M2.x merge code
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@966681 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java index a4f8bb0166..8e4b59910c 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java +++ b/qpid/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 { |