servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r638877 - in /servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp: FTPClientPool.java SocketClientPoolSupport.java
Date Wed, 19 Mar 2008 15:35:58 GMT
Author: gertv
Date: Wed Mar 19 08:35:55 2008
New Revision: 638877

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

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

Modified: servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java?rev=638877&r1=638876&r2=638877&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java
(original)
+++ servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FTPClientPool.java
Wed Mar 19 08:35:55 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/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java?rev=638877&r1=638876&r2=638877&view=diff
==============================================================================
--- servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java
(original)
+++ servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/SocketClientPoolSupport.java
Wed Mar 19 08:35:55 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);



Mime
View raw message