Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E269102AE for ; Mon, 2 Mar 2015 07:17:31 +0000 (UTC) Received: (qmail 79656 invoked by uid 500); 2 Mar 2015 07:17:09 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 79505 invoked by uid 500); 2 Mar 2015 07:17:09 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 79486 invoked by uid 99); 2 Mar 2015 07:17:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Mar 2015 07:17:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F39D4DF9C4; Mon, 2 Mar 2015 07:17:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Mon, 02 Mar 2015 07:17:15 -0000 Message-Id: In-Reply-To: <989a7e5f836d4fbcb23dfe836da10027@git.apache.org> References: <989a7e5f836d4fbcb23dfe836da10027@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Sun Mar 1 15:42:52 2015 +0100 Committer: Claus Ibsen 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 { FtpEndpoint answer = new FtpEndpoint(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();