QPID-92 Changes to bring MINA use up to MINA-Head (1.1.0) compatibility

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

1 files changed, 4 insertions, 5 deletions

diff --git a/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java b/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java
index 275ed39b5f..ee3b3ceb8a 100644
--- a/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java
+++ b/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java
@@ -27,7 +27,6 @@ import org.apache.mina.common.IoSession;
 import org.apache.mina.common.RuntimeIOException;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.transport.socket.nio.SocketConnector;
-import org.apache.mina.transport.socket.nio.SocketConnectorConfig;
 import org.apache.mina.transport.socket.nio.SocketSessionConfig;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.cluster.util.LogMessage;
@@ -63,7 +62,7 @@ public class MinaBrokerProxy extends Broker implements MethodHandler
     {
         super(host, port);
         _local = local;
-        _legacyHandler = new ClientHandlerRegistry(local);
+        _legacyHandler = new ClientHandlerRegistry(local);            
     }
 
     private void init(IoSession session)
@@ -76,14 +75,14 @@ public class MinaBrokerProxy extends Broker implements MethodHandler
     {
         _logger.info("Connecting to cluster peer: " + getDetails());
         SocketConnector ioConnector = new SocketConnector();
-        SocketConnectorConfig cfg = (SocketConnectorConfig) ioConnector.getDefaultConfig();
 
-        SocketSessionConfig scfg = (SocketSessionConfig) cfg.getSessionConfig();
+        SocketSessionConfig scfg = (SocketSessionConfig) ioConnector.getSessionConfig();
         scfg.setTcpNoDelay(true);
         scfg.setSendBufferSize(32768);
         scfg.setReceiveBufferSize(32768);
         InetSocketAddress address = new InetSocketAddress(getHost(), getPort());
-        return ioConnector.connect(address, _binding);
+        ioConnector.setHandler(_binding);
+        return ioConnector.connect(address);
     }
 
     //extablish connection without handling redirect