2 files changed, 10 insertions, 12 deletions

diff --git a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java b/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
index bae3a60675..a665463736 100644
--- a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
+++ b/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
@@ -27,7 +27,6 @@ import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.common.IoHandlerAdapter;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
-import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketSessionConfig;
 import org.junit.Test;
 import org.apache.qpid.pool.ReadWriteThreadModel;
@@ -76,17 +75,18 @@ public class AcceptorTest
     {
         IoAcceptor acceptor = null;
         acceptor = new SocketAcceptor();
-        
-        SocketAcceptorConfig config = (SocketAcceptorConfig) acceptor.getDefaultConfig();
-        SocketSessionConfig sc = (SocketSessionConfig) config.getSessionConfig();
+
+        SocketSessionConfig sc = (SocketSessionConfig) acceptor.getSessionConfig();
         sc.setTcpNoDelay(true);
         sc.setSendBufferSize(32768);
         sc.setReceiveBufferSize(32768);
 
-        config.setThreadModel(new ReadWriteThreadModel());
+        acceptor.setThreadModel(new ReadWriteThreadModel());
+
+        acceptor.setLocalAddress(new InetSocketAddress(PORT));
+        acceptor.setHandler(new TestHandler());
+        acceptor.bind();
 
-        acceptor.bind(new InetSocketAddress(PORT),
-                      new TestHandler());
         _logger.info("Bound on port " + PORT);
     }
 
diff --git a/java/client/test/src/org/apache/qpid/mina/WriterTest.java b/java/client/test/src/org/apache/qpid/mina/WriterTest.java
index dc29861c87..798cde9366 100644
--- a/java/client/test/src/org/apache/qpid/mina/WriterTest.java
+++ b/java/client/test/src/org/apache/qpid/mina/WriterTest.java
@@ -24,7 +24,6 @@ import junit.framework.JUnit4TestAdapter;
 import org.apache.log4j.Logger;
 import org.apache.mina.common.*;
 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.junit.Test;
 
@@ -181,16 +180,15 @@ public class WriterTest implements Runnable
 
         ioConnector = new SocketConnector();
         
-        SocketConnectorConfig cfg = (SocketConnectorConfig) ioConnector.getDefaultConfig();
-        cfg.setThreadModel(ThreadModel.MANUAL);
-        SocketSessionConfig scfg = (SocketSessionConfig) cfg.getSessionConfig();
+        SocketSessionConfig scfg = (SocketSessionConfig) ioConnector.getSessionConfig();
         scfg.setTcpNoDelay(true);
         scfg.setSendBufferSize(32768);
         scfg.setReceiveBufferSize(32768);
 
         final InetSocketAddress address = new InetSocketAddress("localhost", AcceptorTest.PORT);
         _logger.info("Attempting connection to " + address);
-        ConnectFuture future = ioConnector.connect(address, new WriterHandler());
+        ioConnector.setHandler(new WriterHandler());
+        ConnectFuture future = ioConnector.connect(address);
         // wait for connection to complete
         future.join();
         _logger.info("Connection completed");