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 2009/01/06 21:25:55 UTC
svn commit: r732098 - in
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver:
impl/FtpIoSession.java listener/ListenerFactory.java
Author: ngn
Date: Tue Jan 6 12:25:55 2009
New Revision: 732098
URL: http://svn.apache.org/viewvc?rev=732098&view=rev
Log:
Enforce the user set max idle time within the boundary set by the listener idle timeout (FTPSERVER-258)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java?rev=732098&r1=732097&r2=732098&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java Tue Jan 6 12:25:55 2009
@@ -617,7 +617,13 @@
public void setMaxIdleTime(int maxIdleTime) {
setAttribute(ATTRIBUTE_MAX_IDLE_TIME, maxIdleTime);
-
+
+ int listenerTimeout = getListener().getIdleTimeout();
+
+ // the listener timeout should be the upper limit, unless set to unlimited
+ if(listenerTimeout <= 0 || maxIdleTime < listenerTimeout) {
+ wrappedSession.getConfig().setBothIdleTime(maxIdleTime);
+ }
}
public synchronized void increaseFailedLogins() {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java?rev=732098&r1=732097&r2=732098&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java Tue Jan 6 12:25:55 2009
@@ -26,7 +26,6 @@
import org.apache.ftpserver.DataConnectionConfiguration;
import org.apache.ftpserver.DataConnectionConfigurationFactory;
import org.apache.ftpserver.FtpServerConfigurationException;
-import org.apache.ftpserver.impl.DefaultDataConnectionConfiguration;
import org.apache.ftpserver.listener.nio.NioListener;
import org.apache.ftpserver.ssl.SslConfiguration;
import org.apache.mina.filter.firewall.Subnet;