You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/09/22 09:06:48 UTC
svn commit: r999781 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/file/GenericFile.java
main/java/org/apache/camel/util/FileUtil.java
test/java/org/apache/camel/util/FileUtilTest.java
Author: davsclaus
Date: Wed Sep 22 07:06:47 2010
New Revision: 999781
URL: http://svn.apache.org/viewvc?rev=999781&view=rev
Log:
CAMEL-3144: Fixed onlyPath on FileUtil.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=999781&r1=999780&r2=999781&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java Wed Sep 22 07:06:47 2010
@@ -43,7 +43,7 @@ public class GenericFile<T> {
private GenericFileBinding<T> binding;
private boolean absolute;
- public char getFileSeparator() {
+ public static char getFileSeparator() {
return File.separatorChar;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java?rev=999781&r1=999780&r2=999781&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java Wed Sep 22 07:06:47 2010
@@ -151,16 +151,16 @@ public final class FileUtil {
return null;
}
int pos = name.lastIndexOf('/');
+ if (pos == -1) {
+ pos = name.lastIndexOf(File.separator);
+ }
if (pos > 0) {
return name.substring(0, pos);
} else if (pos == 0) {
- // name is actually the root path
- return name;
- } else {
- pos = name.lastIndexOf(File.separator);
+ // name is in the root path, so extract the path as the first char
+ return name.substring(0, 1);
}
-
- // no path
+ // no path in name
return null;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java?rev=999781&r1=999780&r2=999781&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java Wed Sep 22 07:06:47 2010
@@ -67,6 +67,8 @@ public class FileUtilTest extends TestCa
public void testStripPath() {
assertEquals(null, FileUtil.stripPath(null));
+ assertEquals("", FileUtil.stripPath("/"));
+ assertEquals("foo.xml", FileUtil.stripPath("/foo.xml"));
assertEquals("foo", FileUtil.stripPath("foo"));
assertEquals("bar", FileUtil.stripPath("foo/bar"));
assertEquals("bar", FileUtil.stripPath("/foo/bar"));
@@ -86,6 +88,8 @@ public class FileUtilTest extends TestCa
assertEquals("foo", FileUtil.onlyPath("foo/bar.xml"));
assertEquals("/foo", FileUtil.onlyPath("/foo/bar.xml"));
assertEquals("/foo/bar", FileUtil.onlyPath("/foo/bar/baz.xml"));
+ assertEquals("/", FileUtil.onlyPath("/foo.xml"));
+ assertEquals("/bar", FileUtil.onlyPath("/bar/foo.xml"));
}
public void testCompactPath() {