diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java index 803dc01..2bc45f9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java @@ -115,7 +115,11 @@ public ContainerReport getAMContainer(ApplicationAttemptId appAttemptId) @Override public ApplicationReport getApplication(ApplicationId appId) throws IOException { - return convertToApplicationReport(historyStore.getApplication(appId)); + ApplicationHistoryData appHistory = historyStore.getApplication(appId); + if (appHistory == null) { + return null; + } + return convertToApplicationReport(appHistory); } private ApplicationReport convertToApplicationReport(