diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java index 0aa318c..38936c3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java @@ -310,8 +310,11 @@ public String getUser() { } private Set getPendingLogFilesToUpload(File containerLogDir) { - Set candidates = - new HashSet(Arrays.asList(containerLogDir.listFiles())); + File[] allFiles = containerLogDir.listFiles(); + if (allFiles == null) { + return new HashSet(); + } + Set candidates = new HashSet(Arrays.asList(allFiles)); for (File logFile : candidates) { this.allExistingFileMeta.add(getLogFileMetaData(logFile)); }