o Added some missing javadoc o Correctly initialize the session config buffers using the connected socket
Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/08cd021e Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/08cd021e Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/08cd021e Branch: refs/heads/trunk Commit: 08cd021eaf7e7bc737a6690e559fde014e6b9624 Parents: ba2907c Author: Emmanuel Lécharny <[email protected]> Authored: Mon May 20 19:11:25 2013 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Mon May 20 19:11:25 2013 +0200 ---------------------------------------------------------------------- .../mina/transport/nio/tcp/NioTcpClient.java | 6 ++++++ .../mina/transport/nio/udp/NioUdpClient.java | 10 ++++++++-- .../mina/transport/udp/AbstractUdpClient.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/08cd021e/core/src/main/java/org/apache/mina/transport/nio/tcp/NioTcpClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/transport/nio/tcp/NioTcpClient.java b/core/src/main/java/org/apache/mina/transport/nio/tcp/NioTcpClient.java index fce1a2f..be35a62 100644 --- a/core/src/main/java/org/apache/mina/transport/nio/tcp/NioTcpClient.java +++ b/core/src/main/java/org/apache/mina/transport/nio/tcp/NioTcpClient.java @@ -159,12 +159,18 @@ public class NioTcpClient extends AbstractTcpClient { if (receiveBufferSize != null) { session.getConfig().setReadBufferSize(receiveBufferSize); + } else { + int rcvBufferSize = clientSocket.socket().getReceiveBufferSize(); + session.getConfig().setReadBufferSize(rcvBufferSize); } Integer sendBufferSize = config.getSendBufferSize(); if (sendBufferSize != null) { session.getConfig().setSendBufferSize(sendBufferSize); + } else { + int sndBufferSize = clientSocket.socket().getSendBufferSize(); + session.getConfig().setSendBufferSize(sndBufferSize); } Integer trafficClass = config.getTrafficClass(); http://git-wip-us.apache.org/repos/asf/mina/blob/08cd021e/core/src/main/java/org/apache/mina/transport/nio/udp/NioUdpClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/transport/nio/udp/NioUdpClient.java b/core/src/main/java/org/apache/mina/transport/nio/udp/NioUdpClient.java index 9ab4338..1abe479 100644 --- a/core/src/main/java/org/apache/mina/transport/nio/udp/NioUdpClient.java +++ b/core/src/main/java/org/apache/mina/transport/nio/udp/NioUdpClient.java @@ -79,7 +79,7 @@ public class NioUdpClient extends AbstractUdpClient { NioSelectorLoop loop = (NioSelectorLoop) readWriteSelectorPool.getSelectorLoop(); - final NioUdpSession session = new NioUdpSession(this, idleChecker, ch, null, remoteAddress, loop); + NioUdpSession session = new NioUdpSession(this, idleChecker, ch, null, remoteAddress, loop); session.setConnected(); @@ -104,12 +104,18 @@ public class NioUdpClient extends AbstractUdpClient { if (readBufferSize != null) { session.getConfig().setReadBufferSize(readBufferSize); + } else { + int rcvBufferSize = ch.socket().getReceiveBufferSize(); + session.getConfig().setReadBufferSize(rcvBufferSize); } Integer sendBufferSize = config.getSendBufferSize(); if (sendBufferSize != null) { session.getConfig().setSendBufferSize(sendBufferSize); + } else { + int sndBufferSize = ch.socket().getSendBufferSize(); + session.getConfig().setSendBufferSize(sndBufferSize); } Integer trafficClass = config.getTrafficClass(); @@ -122,6 +128,7 @@ public class NioUdpClient extends AbstractUdpClient { ConnectFuture cf = new ConnectFuture(); cf.complete(session); + return cf; } @@ -132,5 +139,4 @@ public class NioUdpClient extends AbstractUdpClient { public IoFuture<IoSession> connect(SocketAddress remoteAddress, SocketAddress localAddress) { throw new IllegalStateException("not supported for UDP"); } - } http://git-wip-us.apache.org/repos/asf/mina/blob/08cd021e/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java b/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java index ec57016..a8d9747 100644 --- a/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java +++ b/core/src/main/java/org/apache/mina/transport/udp/AbstractUdpClient.java @@ -29,7 +29,7 @@ import org.apache.mina.service.client.AbstractIoClient; import org.apache.mina.service.executor.IoHandlerExecutor; /** - * TODO + * Base class for UDP based Clients * * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */
