Author: davsclaus
Date: Sat Mar 16 07:34:41 2013
New Revision: 1457221
URL: http://svn.apache.org/r1457221
Log:
CAMEL-6056: Restore camel-ftp to use loigc from working Camel 2.10.2 as
otherwise we risk break other stuff for people.
Added:
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
- copied unchanged from r1456990,
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1456990
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=1457221&r1=1457220&r2=1457221&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
Sat Mar 16 07:34:41 2013
@@ -653,12 +653,8 @@ public class FtpOperations implements Re
}
// must compact path so FTP server can traverse correctly
- String before = path;
- char separatorChar = endpoint.getFileSeparator();
- path = FileUtil.compactPath(path, separatorChar);
- if (log.isTraceEnabled()) {
- log.trace("Compacted path: {} -> {} using separator: {}", new
Object[]{before, path, separatorChar});
- }
+ // use the ftp utils implementation of the compact path
+ path = FtpUtils.compactPath(path);
// not stepwise should change directory in one operation
if (!endpoint.getConfiguration().isStepwise()) {
