YARN-3425. NPE from RMNodeLabelsManager.serviceStop when NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda)

Backport YARN-6632 by Inigo Goiri.

(cherry picked from commit 492239424a3ace9868b6154f44a0f18fa5318235)

hadoop-yarn-project/CHANGES.txt

@@ -15,6 +15,10 @@ Release 2.7.6 - UNRELEASED
     YARN-7661. NodeManager metrics return wrong value after update node
     resource (Yang Wang via jlowe)
 
+    YARN-3425. NPE from RMNodeLabelsManager.serviceStop when
+    NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda)
+    Backport YARN-6632 by Inigo Goiri.
+
 Release 2.7.5 - 2017-12-14
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java

@@ -248,7 +248,9 @@ public class CommonNodeLabelsManager extends AbstractService {
   // for UT purpose
   protected void stopDispatcher() {
     AsyncDispatcher asyncDispatcher = (AsyncDispatcher) dispatcher;
-    asyncDispatcher.stop();
+    if (null != asyncDispatcher) {
+      asyncDispatcher.stop();
+    }
   }
   
   @Override