Просмотр исходного кода

YARN-6517. Fix warnings from Spotbugs in hadoop-yarn-common(addendum). Contributed by Weiwei Yang.

(cherry picked from commit 7582dedad1c73eabdc3eeece0a3a860e7bb33c1a)
Naganarasimha 8 лет назад
Родитель
Сommit
3106f256e2

+ 8 - 3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java

@@ -308,12 +308,17 @@ public class AggregatedLogFormat {
     }
 
     private Set<File> getPendingLogFilesToUpload(File containerLogDir) {
-      if(containerLogDir == null ||
-          containerLogDir.listFiles() == null) {
+      if(containerLogDir == null) {
         return new HashSet<>(0);
       }
+
+      File[] filesList = containerLogDir.listFiles();
+      if (filesList == null) {
+        return new HashSet<>(0);
+      }
+
       Set<File> candidates =
-          new HashSet<File>(Arrays.asList(containerLogDir.listFiles()));
+          new HashSet<File>(Arrays.asList(filesList));
       for (File logFile : candidates) {
         this.allExistingFileMeta.add(getLogFileMetaData(logFile));
       }