You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by dl...@apache.org on 2008/11/14 19:09:02 UTC

svn commit: r714088 - /mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java

Author: dlat
Date: Fri Nov 14 10:09:01 2008
New Revision: 714088

URL: http://svn.apache.org/viewvc?rev=714088&view=rev
Log:
FTPSERVER-219 The STOR command can hang a thread.  

Modified:
    mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java

Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java?rev=714088&r1=714087&r2=714088&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java Fri Nov 14 10:09:01 2008
@@ -318,7 +318,7 @@
             LOG.warn("FtpDataConnection.getDataSocket()", ex);
             throw ex;
         }
-
+        dataSoc.setSoTimeout(dataConfig.getIdleTime()*1000);
         // Make sure we initate the SSL handshake, or we'll
         // get an error if we turn out not to send any data
         // e.g. during the listing of an empty dir