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 wa...@apache.org on 2015/04/01 19:15:04 UTC
hadoop git commit: YARN-3425. NPE from
RMNodeLabelsManager.serviceStop when NodeLabelsManager.serviceInit failed.
(Bibin A Chundatt via wangda)
Repository: hadoop
Updated Branches:
refs/heads/trunk 2e79f1c21 -> 492239424
YARN-3425. NPE from RMNodeLabelsManager.serviceStop when NodeLabelsManager.serviceInit failed. (Bibin A Chundatt via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/49223942
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/49223942
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/49223942
Branch: refs/heads/trunk
Commit: 492239424a3ace9868b6154f44a0f18fa5318235
Parents: 2e79f1c
Author: Wangda Tan <wa...@apache.org>
Authored: Wed Apr 1 10:14:48 2015 -0700
Committer: Wangda Tan <wa...@apache.org>
Committed: Wed Apr 1 10:14:48 2015 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49223942/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2888a65..f5dc39d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -129,6 +129,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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49223942/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java
----------------------------------------------------------------------
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 a5e2756..fe38164 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
@@ -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