You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/06/07 10:17:09 UTC

svn commit: r545139 - in /incubator/ftpserver/trunk: core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java

Author: ngn
Date: Thu Jun  7 03:17:06 2007
New Revision: 545139

URL: http://svn.apache.org/viewvc?view=rev&rev=545139
Log:
Fix bug where the entire FtpServer would deadlock due to write being syncronized between sessions in the MINA listener (FTPSERVER-91)

Modified:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java
    incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java?view=diff&rev=545139&r1=545138&r2=545139
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java Thu Jun  7 03:17:06 2007
@@ -40,7 +40,7 @@
     }
 
     public void write(FtpReply response) throws IOException {
-        session.write(response).join();
+        session.write(response);
     }
 
     protected InetAddress getFallbackServerAddress() {

Modified: incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java?view=diff&rev=545139&r1=545138&r2=545139
==============================================================================
--- incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java (original)
+++ incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java Thu Jun  7 03:17:06 2007
@@ -38,6 +38,7 @@
 import org.apache.ftpserver.config.PropertiesConfiguration;
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.listener.io.IOListener;
+import org.apache.ftpserver.listener.mina.MinaListener;
 import org.apache.ftpserver.util.IoUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,7 +85,7 @@
         assertTrue(FTPSERVER_KEYSTORE.exists());
         
         Properties configProps = new Properties();
-        configProps.setProperty("config.listeners.default.class", IOListener.class.getName());
+        configProps.setProperty("config.listeners.default.class", MinaListener.class.getName());
         configProps.setProperty("config.listeners.default.port", Integer
                 .toString(port));
         configProps.setProperty("config.listeners.default.ssl.class",