You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ay...@apache.org on 2013/07/23 13:14:21 UTC
git commit: CAMEL-6309: Sftp upload to subdirectory does not work if
home directory is root
Updated Branches:
refs/heads/master 23d0452ff -> b51e36449
CAMEL-6309: Sftp upload to subdirectory does not work if home directory is root
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b51e3644
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b51e3644
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b51e3644
Branch: refs/heads/master
Commit: b51e36449713b0550ecdd64f7e0bd02f82ad3321
Parents: 23d0452
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Tue Jul 23 13:12:22 2013 +0200
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Tue Jul 23 13:14:12 2013 +0200
----------------------------------------------------------------------
camel-core/src/main/java/org/apache/camel/util/FileUtil.java | 2 +-
.../src/test/java/org/apache/camel/util/FileUtilTest.java | 8 ++++++++
.../org/apache/camel/component/file/remote/FtpUtils.java | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b51e3644/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
index 3eabe85..336a6fe 100644
--- a/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
@@ -275,7 +275,7 @@ public final class FileUtil {
}
}
- if (endsWithSlash) {
+ if (endsWithSlash && stack.size() > 0) {
sb.append(separator);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b51e3644/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java b/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
index e9a6431..1ef3b1e 100644
--- a/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
@@ -149,6 +149,10 @@ public class FileUtilTest extends TestCase {
assertEquals("foo\\bar\\baz", FileUtil.compactPath("foo\\bar\\.\\baz"));
assertEquals("foo\\bar\\baz", FileUtil.compactPath("foo\\bar\\\\baz"));
assertEquals("\\foo\\bar\\baz", FileUtil.compactPath("\\foo\\bar\\baz"));
+ assertEquals("\\", FileUtil.compactPath("\\"));
+ assertEquals("\\", FileUtil.compactPath("/"));
+ assertEquals("/", FileUtil.compactPath("\\", '/'));
+ assertEquals("/", FileUtil.compactPath("/", '/'));
} else {
assertEquals("../foo", FileUtil.compactPath("../foo"));
assertEquals("../../foo", FileUtil.compactPath("../../foo"));
@@ -164,6 +168,10 @@ public class FileUtilTest extends TestCase {
assertEquals("foo/bar/baz", FileUtil.compactPath("foo/bar/./baz"));
assertEquals("foo/bar/baz", FileUtil.compactPath("foo/bar//baz"));
assertEquals("/foo/bar/baz", FileUtil.compactPath("/foo/bar/baz"));
+ assertEquals("/", FileUtil.compactPath("/"));
+ assertEquals("/", FileUtil.compactPath("\\"));
+ assertEquals("/", FileUtil.compactPath("/", '/'));
+ assertEquals("/", FileUtil.compactPath("\\", '/'));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b51e3644/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
index c4d1fb1..18cdb44 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpUtils.java
@@ -87,7 +87,7 @@ public final class FtpUtils {
}
}
- if (endsWithSlash) {
+ if (endsWithSlash && stack.size() > 0) {
sb.append(File.separator);
}