[jboss-svn-commits] JBL Code SVN: r24008 - in labs/jbossesb/workspace/skeagh: routing/file/src/main/java/org/jboss/esb/file/util and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2008-11-20 16:08:54 -0500 (Thu, 20 Nov 2008)
New Revision: 24008

Modified:
   labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java
   labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/util/FileRouterUtil.java
Log:
Just minor clean up.


Modified: labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java	2008-11-20 20:58:25 UTC (rev 24007)
+++ labs/jbossesb/workspace/skeagh/commons/src/main/java/org/jboss/esb/util/FileUtil.java	2008-11-20 21:08:54 UTC (rev 24008)
@@ -274,7 +274,7 @@
     {
         AssertArgument.isNotNullAndNotEmpty(fromExpression, "expression");
 
-        final String normalizedFromExpression = fromExpression.replace('\\', '/');
+        final String normalizedFromExpression = normalizePathSeparator(fromExpression);
         final int indexOfFileSeparator = normalizedFromExpression.indexOf('/');
         final int indexOfVariable = normalizedFromExpression.indexOf('$');
 
@@ -296,6 +296,16 @@
         return null;
     }
 
+    public static String normalizePathSeparator(final String path)
+    {
+        if (path != null)
+        {
+            return path.replace('\\', '/');
+        }
+
+        return path;
+    }
+
     /**
      *
      * @param from The expression to remove path information from
@@ -303,8 +313,7 @@
      */
     public static String removePath(final String from)
     {
-        String newName = from.replace('\\', '/');
-        //String newName = from;
+        String newName = normalizePathSeparator(from);
         final int indexOfFileSeparator = newName.lastIndexOf(File.separatorChar);
         if (indexOfFileSeparator != -1)
         {

Modified: labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/util/FileRouterUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/util/FileRouterUtil.java	2008-11-20 20:58:25 UTC (rev 24007)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/util/FileRouterUtil.java	2008-11-20 21:08:54 UTC (rev 24008)
@@ -84,7 +84,7 @@
     {
         final File dir = FileUtil.evalTargetDirectory(pattern);
 
-        if(dir == null)
+        if (dir == null)
         {
             throw new ConfigurationException("Unable to evaluate target directory '" + pattern + "'.");
         }