Repository: incubator-slider Updated Branches: refs/heads/develop 6c4374392 -> 3ed76a5cc
SLIDER-510 Correctly handle null check for yarnRegistryOperations in SliderAppMaster#unregisterComponent() Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/28505391 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/28505391 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/28505391 Branch: refs/heads/develop Commit: 285053911736b8948b3f4477af4f4558f85caa76 Parents: eba79a4 Author: tedyu <[email protected]> Authored: Mon Oct 13 16:48:59 2014 -0700 Committer: tedyu <[email protected]> Committed: Mon Oct 13 16:48:59 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/28505391/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index a887cf8..d2a8936 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -1087,9 +1087,10 @@ public class SliderAppMaster extends AbstractSliderLaunchedService */ public void unregisterComponent(ContainerId id) { log.info("Unregistering component {}", id); - if (yarnRegistryOperations== null) { + if (yarnRegistryOperations == null) { log.warn("Processing unregister component event before initialization " + "completed; init flag =" + initCompleted); + return; } String cid = RegistryPathUtils.encodeYarnID(id.toString()); try {
