svn commit: r1494374 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java

[cn...@apache.org]

Author: cnauroth
Date: Tue Jun 18 23:22:42 2013
New Revision: 1494374

URL: http://svn.apache.org/r1494374
Log:
HADOOP-9624. TestFSMainOperationsLocalFileSystem failed when the Hadoop test root path has "X" in its name. Contributed by Xi Fang.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1494374&r1=1494373&r2=1494374&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Jun 18 23:22:42 2013
@@ -55,6 +55,9 @@ Release 1.3.0 - unreleased
     MAPREDUCE-5250. Searching for ';' in JobTracker History throws 
     ArrayOutOfBoundException. (kkambatl via tucu)
 
+    HADOOP-9624. TestFSMainOperationsLocalFileSystem failed when the Hadoop test
+    root path has "X" in its name. (Xi Fang via cnauroth)
+
 Release 1.2.1 - Unreleased 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java?rev=1494374&r1=1494373&r2=1494374&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java (original)
+++ hadoop/common/branches/branch-1/src/test/org/apache/hadoop/fs/FSMainOperationsBaseTest.java Tue Jun 18 23:22:42 2013
@@ -66,10 +66,10 @@ public abstract class FSMainOperationsBa
     }
   };
 
-  //A test filter with returns any path containing a "b" 
+  //A test filter with returns any path containing an "x" or "X"
   final private static PathFilter TEST_X_FILTER = new PathFilter() {
     public boolean accept(Path file) {
-      if(file.getName().contains("x") || file.toString().contains("X"))
+      if(file.getName().contains("x") || file.getName().contains("X"))
         return true;
       else
         return false;