svn commit: r638878 - in /servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp: FTPClientPool.java SocketClientPoolSupport.java

[gertv]

Author: gertv
Date: Wed Mar 19 08:36:22 2008
New Revision: 638878

URL: http://svn.apache.org/viewvc?rev=638878&view=rev
Log:
SM-1280: FTP poller stalls because the connection pool is empty

Modified:
    
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java
    
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java

Modified: 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java?rev=638878&r1=638877&r2=638878&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java
 Wed Mar 19 08:36:22 2008
@@ -147,10 +147,10 @@
         if (config != null) {
             ftp.configure(config);
         }
-        ftp.setDataTimeout(getDataTimeout());
         ftp.setControlEncoding(getControlEncoding());
 
         super.connect(ftp);
+        ftp.setDataTimeout(getDataTimeout());
 
         int code = ftp.getReplyCode();
         if (!FTPReply.isPositiveCompletion(code)) {

Modified: 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java
URL: 
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java?rev=638878&r1=638877&r2=638878&view=diff
==============================================================================
--- 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java
 (original)
+++ 
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java
 Wed Mar 19 08:36:22 2008
@@ -46,6 +46,7 @@
         if (pool == null) {
             GenericObjectPool goPool = new GenericObjectPool();
             goPool.setTestOnBorrow(true);
+            
goPool.setWhenExhaustedAction(GenericObjectPool.WHEN_EXHAUSTED_GROW);
             pool = goPool;
         }
         pool.setFactory(this);