Author: ngn
Date: Fri Dec 19 13:18:12 2008
New Revision: 728145
URL: http://svn.apache.org/viewvc?rev=728145&view=rev
Log:
idle-timeout on data connections not parsed by XML config (FTPSERVER-246).
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java?rev=728145&r1=728144&r2=728145&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
Fri Dec 19 13:18:12 2008
@@ -254,8 +254,12 @@
// data con config element available
SslConfiguration ssl = parseSsl(element);
- LOG.debug("SSL configuration found for the data connection");
- dc.setSslConfiguration(ssl);
+ if (ssl != null) {
+ LOG.debug("SSL configuration found for the data connection");
+ dc.setSslConfiguration(ssl);
+ }
+
+ dc.setIdleTime(SpringUtil.parseInt(element, "idle-timeout",
dc.getIdleTime()));
Element activeElm = SpringUtil.getChildElement(element,
FtpServerNamespaceHandler.FTPSERVER_NS, "active");
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java?rev=728145&r1=728144&r2=728145&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
Fri Dec 19 13:18:12 2008
@@ -67,6 +67,8 @@
assertEquals(2222, ((NioListener) listener).getPort());
assertEquals(InetAddress.getByName("1.2.3.4"),
InetAddress.getByName(((NioListener) listener)
.getServerAddress()));
+ assertEquals(100, ((NioListener) listener)
+ .getDataConnectionConfiguration().getIdleTime());
assertEquals(true, ((NioListener) listener)
.getDataConnectionConfiguration().isActiveEnabled());
assertEquals(InetAddress.getByName("1.2.3.4"),
InetAddress.getByName(((NioListener) listener)
Modified:
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml?rev=728145&r1=728144&r2=728145&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
(original)
+++
mina/ftpserver/trunk/core/src/test/resources/spring-config/config-spring-1.xml
Fri Dec 19 13:18:12 2008
@@ -38,7 +38,7 @@
<keystore file="src/test/resources/ftpserver.jks"
password="password"/>
</ssl>
- <data-connection>
+ <data-connection idle-timeout="100">
<active enabled="true"
local-address="1.2.3.4"/>
<passive ports="123-125"/>
</data-connection>
