You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/09/24 10:02:20 UTC
svn commit: r818396 -
/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
Author: ningjiang
Date: Thu Sep 24 08:02:20 2009
New Revision: 818396
URL: http://svn.apache.org/viewvc?rev=818396&view=rev
Log:
Fixed the test error of FileUtilTest on Windows
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
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=818396&r1=818395&r2=818396&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 Thu Sep 24 08:02:20 2009
@@ -163,7 +163,12 @@
}
Stack<String> stack = new Stack<String>();
- String[] parts = path.split(File.separator);
+
+ String separatorRegex = File.separator;
+ if (FileUtil.isWindows()) {
+ separatorRegex = "////";
+ }
+ String[] parts = path.split(separatorRegex);
for (String part : parts) {
if (part.equals("..") && !stack.isEmpty()) {
// only pop if there is a previous path