camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/3] camel git commit: CAMEL-8757: SFTP should use soTimeout on session as that is what it is. Thanks to Stephan Siano for the patch.
Date Wed, 13 May 2015 09:58:40 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 483e25cd9 -> 38621ea18
  refs/heads/camel-2.15.x d21a7d859 -> b5e14ca3d
  refs/heads/master 4a3dfb5cc -> eea406565


CAMEL-8757: SFTP should use soTimeout on session as that is what it is. Thanks to Stephan
Siano for the patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eea40656
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eea40656
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eea40656

Branch: refs/heads/master
Commit: eea4065651b40012fab6994ca649c5fe52f3fa55
Parents: 4a3dfb5
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed May 13 11:28:58 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed May 13 11:28:58 2015 +0200

----------------------------------------------------------------------
 .../org/apache/camel/component/file/remote/SftpOperations.java  | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/eea40656/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index 0977468..dab4b8d 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -316,6 +316,11 @@ public class SftpOperations implements RemoteFileOperations<ChannelSftp.LsEntry>
             }
 
         });
+
+        // set the SO_TIMEOUT for the time after the connect phase
+        if (configuration.getSoTimeout() > 0) {
+            session.setTimeout(configuration.getSoTimeout());
+        }
         
         // set proxy if configured
         if (proxy != null) {


Mime
View raw message