Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Naganarasimha 2017-06-18 19:53:42 +05:30
parent 6460df21a0
commit 7582dedad1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
View File

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