Fixed incorrect package on AMQVMBrokerCreationException (did not match physical location).

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

2 files changed, 12 insertions, 26 deletions

diff --git a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
index 4adde3e002..ddcaa067af 100644
--- a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
+++ b/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
@@ -27,7 +27,7 @@ import org.apache.mina.transport.vmpipe.VmPipeAddress;
 import org.apache.qpid.client.AMQBrokerDetails;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.pool.ReadWriteThreadModel;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 
 
 import java.io.IOException;
@@ -107,34 +107,20 @@ public class TransportConnection
 
         {
             case TCP:
-                if (Boolean.getBoolean("amqj.useBlockingIo"))
+                _instance = new SocketTransportConnection(new SocketTransportConnection.SocketConnectorFactory()
                 {
-                    _instance = new SocketTransportConnection(new SocketTransportConnection.SocketConnectorFactory()
+                    public IoConnector newSocketConnector()
                     {
-                        public IoConnector newSocketConnector()
-                        {
-                            return new org.apache.qpid.bio.SocketConnector(); // blocking connector
-                        }
-                    });
-                }
-                else
-                {
-                    _instance = new SocketTransportConnection(new SocketTransportConnection.SocketConnectorFactory()
-                    {
-                        public IoConnector newSocketConnector()
-                        {
-                            SocketConnector result = new SocketConnector(); // non-blocking connector
+                        SocketConnector result = new SocketConnector(); // non-blocking connector
 
-                            // Don't have the connector's worker thread wait around for other connections (we only use
-                            // one SocketConnector per connection at the moment anyway). This allows short-running
-                            // clients (like unit tests) to complete quickly.
-                            result.setWorkerTimeout(0L);
+                        // Don't have the connector's worker thread wait around for other connections (we only use
+                        // one SocketConnector per connection at the moment anyway). This allows short-running
+                        // clients (like unit tests) to complete quickly.
+                        result.setWorkerTimeout(0);
 
-                            return result;
-                        }
-                    });
-
-                }
+                        return result;
+                    }
+                });
                 break;
             case VM:
             {
diff --git a/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java b/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
index 6ff91ea6e3..d13cffd290 100644
--- a/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
+++ b/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.qpid.vmbroker;
+package org.apache.qpid.client.vmbroker;
 
 import org.apache.qpid.client.transport.AMQTransportConnectionException;