Author: ritchiem
Date: Wed Nov 15 08:08:08 2006
New Revision: 475288
URL: http://svn.apache.org/viewvc?view=rev&rev=475288
Log:
QPID-92 Changes to bring MINA use up to MINA-Head (1.1.0) compatibility
Modified:
incubator/qpid/trunk/qpid/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java
Modified:
incubator/qpid/trunk/qpid/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java?view=diff&rev=475288&r1=475287&r2=475288
==============================================================================
---
incubator/qpid/trunk/qpid/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java
(original)
+++
incubator/qpid/trunk/qpid/java/cluster/src/org/apache/qpid/server/cluster/MinaBrokerProxy.java
Wed Nov 15 08:08:08 2006
@@ -27,7 +27,6 @@
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 @@
{
super(host, port);
_local = local;
- _legacyHandler = new ClientHandlerRegistry(local);
+ _legacyHandler = new ClientHandlerRegistry(local);
}
private void init(IoSession session)
@@ -76,14 +75,14 @@
{
_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
