You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/10/23 06:42:59 UTC
svn commit: r707269 - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/listener/nio/NioListener.java
test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java
test/java/org/apache/ftpserver/test/TestUtil.java
Author: ngn
Date: Wed Oct 22 21:42:59 2008
New Revision: 707269
URL: http://svn.apache.org/viewvc?rev=707269&view=rev
Log:
Rollback the removal of setReuseAddress, broke on some platforms (e.g. Solaris).
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/test/TestUtil.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java?rev=707269&r1=707268&r2=707269&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java Wed Oct 22 21:42:59 2008
@@ -128,6 +128,7 @@
address = new InetSocketAddress(getPort());
}
+ acceptor.setReuseAddress(true);
acceptor.getSessionConfig().setReadBufferSize(2048);
acceptor.getSessionConfig().setIdleTime(IdleStatus.BOTH_IDLE,
getIdleTimeout());
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java?rev=707269&r1=707268&r2=707269&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java Wed Oct 22 21:42:59 2008
@@ -60,20 +60,21 @@
try {
server.start();
- fail("Must throw FtpServerConfigurationException");
+
+ // Windows seems to allow for both listeners to bind on the same port...
+ //fail("Must throw FtpServerConfigurationException");
} catch(FtpServerConfigurationException e) {
if(e.getCause() instanceof BindException) {
// OK!
+
+ // we failed to start, make sure things are shut down correctly
+ assertTrue(defaultListener.isStopped());
+ assertTrue(secondListener.isStopped());
+ assertTrue(server.isStopped());
} else {
throw e;
}
}
-
- assertTrue(defaultListener.isStopped());
- assertTrue(secondListener.isStopped());
- assertTrue(server.isStopped());
-
-
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/test/TestUtil.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/test/TestUtil.java?rev=707269&r1=707268&r2=707269&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/test/TestUtil.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/test/TestUtil.java Wed Oct 22 21:42:59 2008
@@ -82,13 +82,15 @@
tmpSocket = new ServerSocket(initPort);
port = initPort;
+
+ System.out.println("Using default port: " + port);
} catch (IOException e) {
System.out.println("Failed to use specified port");
// didn't work, try to find one dynamically
try {
int attempts = 0;
- while (port < 1024 && attempts < 1000) {
+ while (port < 1024 && attempts < 2000) {
attempts++;
tmpSocket = new ServerSocket(0);