Author: davsclaus
Date: Thu Jul 22 14:08:14 2010
New Revision: 966667
URL: http://svn.apache.org/viewvc?rev=966667&view=rev
Log:
CAMEL-2952: Adjusted list files opeartion a bit.
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=966667&r1=966666&r2=966667&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
(original)
+++
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
Thu Jul 22 14:08:14 2010
@@ -422,7 +422,17 @@ public class FtpOperations implements Re
}
public List<FTPFile> listFiles() throws
GenericFileOperationFailedException {
- return listFiles(".");
+ try {
+ final List<FTPFile> list = new ArrayList<FTPFile>();
+ FTPFile[] files = client.listFiles();
+ // can return either null or an empty list depending on FTP servers
+ if (files != null) {
+ list.addAll(Arrays.asList(files));
+ }
+ return list;
+ } catch (IOException e) {
+ throw new
GenericFileOperationFailedException(client.getReplyCode(),
client.getReplyString(), e.getMessage(), e);
+ }
}
public List<FTPFile> listFiles(String path) throws
GenericFileOperationFailedException {
