You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by eb...@apache.org on 2019/09/11 22:11:10 UTC
[hadoop] branch trunk updated: YARN-9815 ReservationACLsTestBase
fails with NPE. Contributed by Ahmed Hussein
This is an automated email from the ASF dual-hosted git repository.
ebadger pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 56b7571 YARN-9815 ReservationACLsTestBase fails with NPE. Contributed by Ahmed Hussein
56b7571 is described below
commit 56b7571131b0af03b32bf1c5673c32634652df21
Author: Eric Badger <eb...@verizonmedia.com>
AuthorDate: Wed Sep 11 21:59:28 2019 +0000
YARN-9815 ReservationACLsTestBase fails with NPE. Contributed by Ahmed Hussein
---
.../yarn/server/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 5586f86b..be2be18 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 class ReservationsACLsManager {
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org