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

(cherry picked from commit 492239424a)
This commit is contained in:
Wangda Tan 2015-04-01 10:14:48 -07:00
parent 5e4d457674
commit 865be70b02
2 changed files with 6 additions and 1 deletions

View File

@ -81,6 +81,9 @@ Release 2.8.0 - UNRELEASED
YARN-3412. RM tests should use MockRM where possible. (kasha)
YARN-3425. NPE from RMNodeLabelsManager.serviceStop when
NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda)
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES

View File

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