This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.21.x by this push:
new f2ec271 camel-ftp - Fix ftpClient.dataTimeout parameter is not
honoured
f2ec271 is described below
commit f2ec271b4d2b81b5012bd140e46b999378e76671
Author: Tadayoshi Sato <[email protected]>
AuthorDate: Tue Jun 5 14:42:25 2018 +0900
camel-ftp - Fix ftpClient.dataTimeout parameter is not honoured
---
.../main/java/org/apache/camel/component/file/remote/FtpEndpoint.java | 2 +-
.../java/org/apache/camel/component/file/remote/FtpsEndpoint.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
index 2bce128..12acb6a 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
@@ -153,7 +153,7 @@ public class FtpEndpoint<T extends FTPFile> extends
RemoteFileEndpoint<FTPFile>
// and we want to keep data timeout so we can log it later
timeout = localParameters.remove("dataTimeout");
if (timeout != null) {
- dataTimeout =
getCamelContext().getTypeConverter().convertTo(int.class, dataTimeout);
+ dataTimeout =
getCamelContext().getTypeConverter().convertTo(int.class, timeout);
}
setProperties(client, localParameters);
}
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
index cb51dbb..7ad5c15 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
@@ -178,7 +178,7 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
// and we want to keep data timeout so we can log it later
timeout = localParameters.remove("dataTimeout");
if (timeout != null) {
- dataTimeout =
getCamelContext().getTypeConverter().convertTo(int.class, dataTimeout);
+ dataTimeout =
getCamelContext().getTypeConverter().convertTo(int.class, timeout);
}
setProperties(client, localParameters);
}
@@ -252,4 +252,4 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
this.sslContextParameters = sslContextParameters;
}
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
[email protected].
