Author: ritchiem
Date: Thu Jul 22 14:22:01 2010
New Revision: 966681
URL: http://svn.apache.org/viewvc?rev=966681&view=rev
Log:
Cleanup M2.x merge code
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java?rev=966681&r1=966680&r2=966681&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/transport/TransportConnection.java
Thu Jul 22 14:22:01 2010
@@ -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
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
