svn commit: r1500851 - in /hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java

[cnauroth]

Author: cnauroth
Date: Mon Jul  8 17:21:42 2013
New Revision: 1500851

URL: http://svn.apache.org/r1500851
Log:
MAPREDUCE-5366. Merging change r1500848 from branch-2 to branch-2.1-beta.

Modified:
    hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
    
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1500851&r1=1500850&r2=1500851&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt 
Mon Jul  8 17:21:42 2013
@@ -448,6 +448,9 @@ Release 2.1.0-beta - 2013-07-02
     MAPREDUCE-5360. TestMRJobClient fails on Windows due to path format.
     (Chuan Liu via cnauroth)
 
+    MAPREDUCE-5366. TestMRAsyncDiskService fails on Windows. (Chuan Liu via
+    cnauroth)
+
     MAPREDUCE-5291. Change MR App to use updated property names in
     container-log4j.properties. (Zhijie Shen via sseth)
 

Modified: 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java?rev=1500851&r1=1500850&r2=1500851&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java
 (original)
+++ 
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java
 Mon Jul  8 17:21:42 2013
@@ -59,8 +59,8 @@ public class TestMRAsyncDiskService exte
     pathname = (new Path(pathname)).toUri().getPath();
     cwd = (new Path(cwd)).toUri().getPath();
 
-    String [] cwdParts = cwd.split(File.separator);
-    String [] pathParts = pathname.split(File.separator);
+    String [] cwdParts = cwd.split(Path.SEPARATOR);
+    String [] pathParts = pathname.split(Path.SEPARATOR);
 
     // There are three possible cases:
     // 1) pathname and cwd are equal. Return '.'
@@ -94,18 +94,18 @@ public class TestMRAsyncDiskService exte
     int parentDirsRequired = cwdParts.length - common;
     for (int i = 0; i < parentDirsRequired; i++) {
       sb.append("..");
-      sb.append(File.separator);
+      sb.append(Path.SEPARATOR);
     }
 
     // Then append all non-common parts of 'pathname' itself.
     for (int i = common; i < pathParts.length; i++) {
       sb.append(pathParts[i]);
-      sb.append(File.separator);
+      sb.append(Path.SEPARATOR);
     }
 
     // Don't end with a '/'.
     String s = sb.toString();
-    if (s.endsWith(File.separator)) {
+    if (s.endsWith(Path.SEPARATOR)) {
       s = s.substring(0, s.length() - 1);
     }