hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdoug...@apache.org
Subject svn commit: r925554 - in /hadoop/mapreduce/trunk: CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java
Date Sat, 20 Mar 2010 06:13:54 GMT
Author: cdouglas
Date: Sat Mar 20 06:13:54 2010
New Revision: 925554

URL: http://svn.apache.org/viewvc?rev=925554&view=rev
Log:
MAPREDUCE-1508. Protect against NPE in TestMultipleLevelCaching. Contributed by Aaron Kimball

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=925554&r1=925553&r2=925554&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Sat Mar 20 06:13:54 2010
@@ -471,6 +471,9 @@ Trunk (unreleased changes)
 
     MAPREDUCE-1615. Fix compilation of TestSubmitJob. (cdouglas)
 
+    MAPREDUCE-1508. Protect against NPE in TestMultipleLevelCaching. (Aaron
+    Kimball via cdouglas)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java?rev=925554&r1=925553&r2=925554&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java
(original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestMultipleLevelCaching.java
Sat Mar 20 06:13:54 2010
@@ -119,8 +119,11 @@ public class TestMultipleLevelCaching ex
     		  testName, mr, fileSys, inDir, outputPath, 1, 1, 0, 0);
       mr.shutdown();
     } finally {
-      fileSys.delete(inDir, true);
-      fileSys.delete(outputPath, true);
+      if (null != fileSys) {
+        // inDir, outputPath only exist if fileSys is valid.
+        fileSys.delete(inDir, true);
+        fileSys.delete(outputPath, true);
+      }
       if (dfs != null) { 
         dfs.shutdown(); 
       }



Mime
View raw message