camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: CAMEL-7930 Fixed the org.apache.camel.itest.ftp.SpringFtpEndpointTest test failure with JDK6
Date Tue, 21 Oct 2014 08:21:10 GMT
Repository: camel
Updated Branches:
  refs/heads/master 8b9f74724 -> 0c7239d45


CAMEL-7930 Fixed the org.apache.camel.itest.ftp.SpringFtpEndpointTest test failure with JDK6


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0c7239d4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0c7239d4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0c7239d4

Branch: refs/heads/master
Commit: 0c7239d45da1107bc5dbae577063878beb2e8f93
Parents: 8b9f747
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Oct 21 16:20:53 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Oct 21 16:20:53 2014 +0800

----------------------------------------------------------------------
 .../java/org/apache/camel/component/file/remote/FtpEndpoint.java | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0c7239d4/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 dfb6def..0652022 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
@@ -146,10 +146,6 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
 
     @Override
     public void setConfiguration(GenericFileConfiguration configuration) {
-        setConfiguration((FtpConfiguration)configuration);
-    }
-
-    public void setConfiguration(FtpConfiguration configuration) {
         if (configuration == null) {
             throw new IllegalArgumentException("FtpConfiguration expected");
         }


Mime
View raw message