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 2021/02/26 19:04:51 UTC

[hadoop] branch trunk updated: YARN-10653. Fixed the findbugs issues introduced by YARN-10647. Contributed by Qi Zhu

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 fcdb1e7  YARN-10653. Fixed the findbugs issues introduced by YARN-10647. Contributed by Qi Zhu
fcdb1e7 is described below

commit fcdb1e7fec45ded55e8b7fdc29f8caf85547cca3
Author: Eric Badger <eb...@verizonmedia.com>
AuthorDate: Fri Feb 26 19:03:59 2021 +0000

    YARN-10653. Fixed the findbugs issues introduced by YARN-10647. Contributed by
    Qi Zhu
---
 .../java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
index 5b9382fc..c19faaa 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
@@ -646,7 +646,7 @@ public class CommonNodeLabelsManager extends AbstractService {
           host.labels.addAll(labels);
           for (Node node : host.nms.values()) {
             replaceNodeForLabels(node.nodeId, node.labels, labels);
-            if (node.labels != null && labels != null) {
+            if (node.labels != null) {
               replaceLabelsForNode(node.nodeId, node.labels, labels);
             }
             node.labels = null;


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