Skip to content

Commit 15e1303

Browse files
author
Minni Mittal
committed
null checks
1 parent 6421ca4 commit 15e1303

File tree

1 file changed

+10
-4
lines changed
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager

1 file changed

+10
-4
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.ArrayList;
2525
import java.util.Collections;
2626
import java.util.List;
27+
import java.util.Map;
2728
import java.util.concurrent.ConcurrentHashMap;
2829
import java.util.concurrent.ConcurrentMap;
2930

@@ -498,12 +499,17 @@ protected RMAppAttemptMetrics getAppAttemptMetrics(
498499
if (app == null) {
499500
return null;
500501
}
501-
RMAppAttempt attempt = app.getAppAttempts().get(appAttemptId);
502-
if (attempt == null) {
502+
503+
Map<ApplicationAttemptId, RMAppAttempt> attempts = app.getAppAttempts();
504+
if (attempts == null) {
503505
return null;
506+
} else {
507+
RMAppAttempt attempt = attempts.get(appAttemptId);
508+
if (attempt == null) {
509+
return null;
510+
}
511+
return attempt.getRMAppAttemptMetrics();
504512
}
505-
506-
return attempt.getRMAppAttemptMetrics();
507513
}
508514

509515
public void registerAppAttempt(ApplicationAttemptId attemptId) {

0 commit comments

Comments
 (0)