You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2008/05/13 05:26:24 UTC
svn commit: r655722 - in /mina/trunk:
core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
Author: trustin
Date: Mon May 12 20:26:23 2008
New Revision: 655722
URL: http://svn.apache.org/viewvc?rev=655722&view=rev
Log:
Fixed DIRMINA-583 - NioSocketAcceptor.reuseAddress should be false by default.
* Changed the default reuseAddress property in NIO and APR acceptor
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java?rev=655722&r1=655721&r2=655722&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java Mon May 12 20:26:23 2008
@@ -45,11 +45,11 @@
* @version $Rev: 389042 $, $Date: 2006-03-27 07:49:41Z $
*/
public final class NioSocketAcceptor
- extends AbstractPollingIoAcceptor<NioSession, ServerSocketChannel>
+ extends AbstractPollingIoAcceptor<NioSession, ServerSocketChannel>
implements SocketAcceptor {
private int backlog = 50;
- private boolean reuseAddress = true;
+ private boolean reuseAddress = false;
private volatile Selector selector;
@@ -65,7 +65,7 @@
super(new DefaultSocketSessionConfig(), NioProcessor.class, processorCount);
((DefaultSocketSessionConfig) getSessionConfig()).init(this);
}
-
+
public NioSocketAcceptor(IoProcessor<NioSession> processor) {
super(new DefaultSocketSessionConfig(), processor);
((DefaultSocketSessionConfig) getSessionConfig()).init(this);
@@ -78,9 +78,9 @@
@Override
protected void init() throws Exception {
- this.selector = Selector.open();
+ selector = Selector.open();
}
-
+
@Override
protected void destroy() throws Exception {
if (selector != null) {
@@ -101,7 +101,7 @@
public InetSocketAddress getLocalAddress() {
return (InetSocketAddress) super.getLocalAddress();
}
-
+
@Override
public InetSocketAddress getDefaultLocalAddress() {
return (InetSocketAddress) super.getDefaultLocalAddress();
@@ -141,7 +141,7 @@
}
}
-
+
@Override
protected NioSession accept(IoProcessor<NioSession> processor,
ServerSocketChannel handle) throws Exception {
@@ -215,11 +215,11 @@
}
private static class ServerSocketChannelIterator implements Iterator<ServerSocketChannel> {
-
+
private final Iterator<SelectionKey> i;
-
+
private ServerSocketChannelIterator(Collection<SelectionKey> selectedKeys) {
- this.i = selectedKeys.iterator();
+ i = selectedKeys.iterator();
}
public boolean hasNext() {
Modified: mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java?rev=655722&r1=655721&r2=655722&view=diff
==============================================================================
--- mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java (original)
+++ mina/trunk/transport-apr/src/main/java/org/apache/mina/transport/socket/apr/AprSocketAcceptor.java Mon May 12 20:26:23 2008
@@ -30,7 +30,7 @@
private volatile boolean toBeWakenUp;
private int backlog = 50;
- private boolean reuseAddress = true;
+ private boolean reuseAddress = false;
private volatile long pool;
private volatile long pollset; // socket poller