You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/03/02 08:17:15 UTC
[8/9] camel git commit: Fixed ftp component after little mistake
committed recently
Fixed ftp component after little mistake committed recently
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19567165
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19567165
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19567165
Branch: refs/heads/master
Commit: 19567165c2ba534844ced26fd3d16b4c1ade4f4f
Parents: f3a9064
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 15:42:52 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 2 08:18:04 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/file/remote/FtpComponent.java | 2 --
.../camel/component/file/remote/RemoteFileConfiguration.java | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/19567165/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
index 7222031..9aeee72 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
@@ -49,8 +49,6 @@ public class FtpComponent extends RemoteFileComponent<FTPFile> {
FtpEndpoint<FTPFile> answer = new FtpEndpoint<FTPFile>(uri, this, config);
extractAndSetFtpClientConfigParameters(parameters, answer);
extractAndSetFtpClientParameters(parameters, answer);
- config.setDirectory(remaining);
- config.setDirectoryName(remaining);
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/19567165/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
index a8590e9..502bd92 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
@@ -90,6 +90,9 @@ public abstract class RemoteFileConfiguration extends GenericFileConfiguration {
@Override
public void configure(URI uri) {
super.configure(uri);
+ // after configure the directory has been resolved, so we can use it for directoryName
+ // (directoryName is the name we use in the other file components, to use consistent name)
+ setDirectoryName(getDirectory());
setProtocol(uri.getScheme());
setDefaultPort();