From 56b7571131b0af03b32bf1c5673c32634652df21 Mon Sep 17 00:00:00 2001
From: Eric Badger <ebadger@verizonmedia.com>
Date: Wed, 11 Sep 2019 21:59:28 +0000
Subject: [PATCH] YARN-9815 ReservationACLsTestBase fails with NPE. Contributed
 by Ahmed Hussein

---
 .../resourcemanager/security/ReservationsACLsManager.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ReservationsACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ReservationsACLsManager.java
index 5586f86bbf3..be2be184f36 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ReservationsACLsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ReservationsACLsManager.java
@@ -79,7 +79,7 @@ public boolean checkAccess(UserGroupInformation callerUGI,
     if (this.reservationAcls.containsKey(queueName)) {
       Map<ReservationACL, AccessControlList> acls = this.reservationAcls.get(
               queueName);
-      if (acls.containsKey(acl)) {
+      if (acls != null && acls.containsKey(acl)) {
         return acls.get(acl).isUserAllowed(callerUGI);
       } else {
         // Give access if acl is undefined for queue.