소스 검색

HADOOP-14942. DistCp#cleanup() should check whether jobFS is null.
Contributed by Andras Bokor.

(cherry picked from commit f36cbc847560d53e7955ced9ce7ce2773c805793)

Steve Loughran 7 년 전
부모
커밋
2bacb429a1
1개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 6 4
      hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java

+ 6 - 4
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java

@@ -453,10 +453,12 @@ public class DistCp extends Configured implements Tool {
 
   private synchronized void cleanup() {
     try {
-      if (metaFolder == null) return;
-
-      jobFS.delete(metaFolder, true);
-      metaFolder = null;
+      if (metaFolder != null) {
+        if (jobFS != null) {
+          jobFS.delete(metaFolder, true);
+        }
+        metaFolder = null;
+      }
     } catch (IOException e) {
       LOG.error("Unable to cleanup meta folder: " + metaFolder, e);
     }