Set AutoCreateInVMBroker to false.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/java@472173 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 17 deletions

diff --git a/client/src/org/apache/qpid/client/transport/TransportConnection.java b/client/src/org/apache/qpid/client/transport/TransportConnection.java
index 5db2ac76e7..e219462df6 100644
--- a/client/src/org/apache/qpid/client/transport/TransportConnection.java
+++ b/client/src/org/apache/qpid/client/transport/TransportConnection.java
@@ -137,7 +137,7 @@ public class TransportConnection
                 break;
             case VM:
             {
-                _instance = getVMTransport(details, Boolean.getBoolean("amqj.NoAutoCreateVMBroker"));
+                _instance = getVMTransport(details, Boolean.getBoolean("amqj.AutoCreateVMBroker"));
                 break;
             }
         }
@@ -160,19 +160,19 @@ public class TransportConnection
         return -1;
     }
 
-    private static ITransportConnection getVMTransport(BrokerDetails details, boolean noAutoCreate) throws AMQVMBrokerCreationException
+    private static ITransportConnection getVMTransport(BrokerDetails details, boolean AutoCreate) throws AMQVMBrokerCreationException
     {
         int port = details.getPort();
 
         if (!_inVmPipeAddress.containsKey(port))
         {
-            if (noAutoCreate)
+            if (AutoCreate)
             {
-                throw new AMQVMBrokerCreationException(port, "VM Broker on port " + port + " does not exist. Auto create disabled.");
+                createVMBroker(port);
             }
             else
             {
-                createVMBroker(port);
+                throw new AMQVMBrokerCreationException(port, "VM Broker on port " + port + " does not exist. Auto create disabled.");
             }
         }
 
@@ -208,7 +208,14 @@ public class TransportConnection
                 {
                     VmPipeAddress pipe = new VmPipeAddress(port);
 
-                    _acceptor.unbind(pipe);
+                    try
+                    {
+                        _acceptor.unbind(pipe);
+                    }
+                    catch (Exception ignore)
+                    {
+                        //ignore
+                    }
 
                     if (provider == null)
                     {
@@ -258,14 +265,7 @@ public class TransportConnection
             Object[] params = {port};
             provider = (IoHandlerAdapter) Class.forName(protocolProviderClass).getConstructor(cnstr).newInstance(params);
             //Give the broker a second to create
-            try
-            {
-                Thread.sleep(1000);
-            }
-            catch (InterruptedException e)
-            {
-                //do nothing
-            }
+            _logger.info("Created Instance");
         }
         catch (Exception e)
         {
@@ -309,8 +309,8 @@ public class TransportConnection
         if (pipe != null)
         {
             _logger.info("Killing VM Broker:" + port);
-            _acceptor.unbind(pipe);
             _inVmPipeAddress.remove(port);
+            _acceptor.unbind(pipe);
         }
     }
 
diff --git a/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java b/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
index f20b0e1409..96c863fae4 100644
--- a/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
+++ b/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
@@ -129,8 +129,6 @@ public class FailoverBrokerTester implements Runnable
 
     private void createWorld()
     {
-        System.setProperty("amqj.NoAutoCreateVMBroker", "true");
-
         genesis();
 
         Thread brokerGod = new Thread(this);