[hadoop] branch trunk updated: YARN-10612. Fix findbugs issue introduced in YARN-10585. Contributed by Gergely Pollak

[snemeth]

This is an automated email from the ASF dual-hosted git repository.

snemeth 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 c174141  YARN-10612. Fix findbugs issue introduced in YARN-10585. 
Contributed by Gergely Pollak
c174141 is described below

commit c17414111ba10b142bae85691a7913dcdae404c1
Author: Szilard Nemeth <snem...@apache.org>
AuthorDate: Thu Feb 4 08:12:13 2021 +0100

    YARN-10612. Fix findbugs issue introduced in YARN-10585. Contributed by 
Gergely Pollak
---
 .../capacity/placement/converter/LegacyMappingRuleToJson.java         | 4 ----
 1 file changed, 4 deletions(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/placement/converter/LegacyMappingRuleToJson.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/placement/converter/LegacyMappingRuleToJson.java
index 113b08b..6aa4049 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/placement/converter/LegacyMappingRuleToJson.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/placement/converter/LegacyMappingRuleToJson.java
@@ -138,10 +138,6 @@ public class LegacyMappingRuleToJson {
    * @return JSON Format of the provided mapping rules, null if no rules are 
set
    */
   public String convert() {
-    if (userGroupMappingRules == null && applicationNameMappingRules == null) {
-      return null;
-    }
-
     //creating the basic JSON config structure
     ObjectNode rootNode = objectMapper.createObjectNode();
     ArrayNode rulesNode = objectMapper.createArrayNode();


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org