Repository: nifi Updated Branches: refs/heads/master 50c364a79 -> e84f9a241
NIFI-4160: SFTPTransfer connection timeout for opening channel. Signed-off-by: Pierre Villard <[email protected]> This closes #1991. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e84f9a24 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e84f9a24 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e84f9a24 Branch: refs/heads/master Commit: e84f9a24164a3c939664a2259f3a0c07c20cfb97 Parents: 50c364a Author: Koji Kawamura <[email protected]> Authored: Fri Jul 7 09:52:53 2017 +0900 Committer: Pierre Villard <[email protected]> Committed: Fri Jul 7 12:31:50 2017 +0200 ---------------------------------------------------------------------- .../org/apache/nifi/processors/standard/util/SFTPTransfer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/e84f9a24/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java index 42fbf8d..a6a9e4b 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java @@ -431,13 +431,14 @@ public class SFTPTransfer implements FileTransfer { session.setPassword(password); } - session.setTimeout(ctx.getProperty(FileTransfer.CONNECTION_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue()); + final int connectionTimeoutMillis = ctx.getProperty(FileTransfer.CONNECTION_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue(); + session.setTimeout(connectionTimeoutMillis); session.connect(); this.session = session; this.closed = false; sftp = (ChannelSftp) session.openChannel("sftp"); - sftp.connect(); + sftp.connect(connectionTimeoutMillis); session.setTimeout(ctx.getProperty(FileTransfer.DATA_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue()); if (!ctx.getProperty(USE_KEEPALIVE_ON_TIMEOUT).asBoolean()) { session.setServerAliveCountMax(0); // do not send keepalive message on SocketTimeoutException
