Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1343732. Backport HADOOP-8444 to branch-2. (harsh) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343735 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-05-29 14:16:35 +00:00
parent d7585fa501
commit 1ff0b15e9b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -52,6 +52,10 @@ Release 2.0.1-alpha - UNRELEASED
HADOOP-8268. A few pom.xml across Hadoop project HADOOP-8268. A few pom.xml across Hadoop project
may fail XML validation. (Radim Kolar via harsh) may fail XML validation. (Radim Kolar via harsh)
HADOOP-8444. Fix the tests FSMainOperationsBaseTest.java and
FileContextMainOperationsBaseTest.java to avoid potential
test failure (Madhukara Phatak via harsh)
Release 2.0.0-alpha - UNRELEASED Release 2.0.0-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
View File

@ -75,7 +75,7 @@ public abstract class FSMainOperationsBaseTest {
//A test filter with returns any path containing a "b" //A test filter with returns any path containing a "b"
final private static PathFilter TEST_X_FILTER = new PathFilter() { final private static PathFilter TEST_X_FILTER = new PathFilter() {
public boolean accept(Path file) { 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; return true;
else else
return false; return false;

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
View File

@ -75,7 +75,7 @@ public abstract class FileContextMainOperationsBaseTest {
//A test filter with returns any path containing a "b" //A test filter with returns any path containing a "b"
final private static PathFilter TEST_X_FILTER = new PathFilter() { final private static PathFilter TEST_X_FILTER = new PathFilter() {
public boolean accept(Path file) { 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; return true;
else else
return false; return false;