Repository: camel Updated Branches: refs/heads/master 9148b0d4d -> 91091d64f
Fixed tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91091d64 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91091d64 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91091d64 Branch: refs/heads/master Commit: 91091d64f0c74aa63f54a296181a55fc4bc7a571 Parents: 9148b0d Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Dec 1 14:03:55 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Dec 1 14:03:55 2014 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/file/remote/FtpEndpoint.java | 2 ++ .../org/apache/camel/component/file/remote/SftpEndpoint.java | 2 ++ .../camel/itest/quartz/DelegateEndpointQuartzTest.java | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/91091d64/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java ---------------------------------------------------------------------- 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 6ae1b79..3164b5c 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 @@ -152,7 +152,9 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile> if (configuration == null) { throw new IllegalArgumentException("FtpConfiguration expected"); } + // need to set on both this.configuration = (FtpConfiguration) configuration; + super.setConfiguration(configuration); } public FTPClient getFtpClient() { http://git-wip-us.apache.org/repos/asf/camel/blob/91091d64/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java index e0c69ab..e891c15 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java @@ -53,7 +53,9 @@ public class SftpEndpoint extends RemoteFileEndpoint<ChannelSftp.LsEntry> { if (configuration == null) { throw new IllegalArgumentException("SftpConfiguration expected"); } + // need to set on both this.configuration = (SftpConfiguration) configuration; + super.setConfiguration(configuration); } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/91091d64/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/DelegateEndpointQuartzTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/DelegateEndpointQuartzTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/DelegateEndpointQuartzTest.java index ac3c00a..5f314a5 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/DelegateEndpointQuartzTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/DelegateEndpointQuartzTest.java @@ -88,6 +88,7 @@ public class DelegateEndpointQuartzTest extends CamelTestSupport { private final Endpoint childEndpoint; MyEndpoint(String uri, Endpoint childEndpoint) { + super(uri); this.childEndpoint = childEndpoint; } @@ -110,7 +111,12 @@ public class DelegateEndpointQuartzTest extends CamelTestSupport { public Endpoint getEndpoint() { return childEndpoint; } - + + @Override + protected String createEndpointUri() { + return "my:" + childEndpoint.getEndpointUri(); + } + } }
