Skip to content

Commit 979c54f

Browse files
author
slfan1989
committed
YARN-11212. Fix CheckStyle.
1 parent 5c9ac18 commit 979c54f

File tree

1 file changed

+11
-11
lines changed
  • hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp

1 file changed

+11
-11
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-router/src/main/java/org/apache/hadoop/yarn/server/router/webapp/RouterWebServiceUtil.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -522,19 +522,19 @@ public static NodeToLabelsInfo mergeNodeToLabels(
522522
HashMap<String, NodeLabelsInfo> nodeToLabels = new HashMap<>();
523523
Collection<NodeToLabelsInfo> nodeToLabelsInfos = nodeToLabelsInfoMap.values();
524524

525-
nodeToLabelsInfos.stream().forEach(nodeToLabelsInfo ->{
525+
nodeToLabelsInfos.stream().forEach(nodeToLabelsInfo -> {
526526
for (Map.Entry<String, NodeLabelsInfo> item : nodeToLabelsInfo.getNodeToLabels().entrySet()) {
527-
if (nodeToLabels.containsKey(item.getKey())) {
528-
NodeLabelsInfo a = nodeToLabels.get(item.getKey());
529-
NodeLabelsInfo b = item.getValue();
530-
531-
HashSet<NodeLabel> hashSet = new HashSet<>();
532-
hashSet.addAll(a.getNodeLabels());
533-
hashSet.addAll(b.getNodeLabels());
534-
nodeToLabels.put(item.getKey(), new NodeLabelsInfo(hashSet));
535-
} else {
536-
nodeToLabels.put(item.getKey(), item.getValue());
527+
String key = item.getKey();
528+
NodeLabelsInfo itemValue = item.getValue();
529+
NodeLabelsInfo nodeToLabelsValue = nodeToLabels.getOrDefault(item.getKey(), null);
530+
HashSet<NodeLabel> hashSet = new HashSet<>();
531+
if (itemValue != null) {
532+
hashSet.addAll(itemValue.getNodeLabels());
533+
}
534+
if (nodeToLabelsValue != null) {
535+
hashSet.addAll(nodeToLabelsValue.getNodeLabels());
537536
}
537+
nodeToLabels.put(key, new NodeLabelsInfo(hashSet));
538538
}
539539
});
540540

0 commit comments

Comments
 (0)