You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/11/20 16:57:20 UTC
[2/3] incubator-slider git commit: SLIDER-659 NPE in slider
am-suicide if you don't provide a message: make sure AM handles null payload
SLIDER-659 NPE in slider am-suicide if you don't provide a message: make sure AM handles null payload
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/976c889b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/976c889b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/976c889b
Branch: refs/heads/develop
Commit: 976c889ba04d23222d7f04ab4f50859a4edf122d
Parents: 6490bd7
Author: Steve Loughran <st...@apache.org>
Authored: Wed Nov 19 16:34:35 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Nov 19 16:34:35 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/slider/server/appmaster/SliderAppMaster.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/976c889b/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 bab359c..e26bc3f 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
@@ -1840,6 +1840,9 @@ the registry with/without the new record format
throws IOException, YarnException {
int signal = request.getSignal();
String text = request.getText();
+ if (text == null) {
+ text = "";
+ }
int delay = request.getDelay();
log.info("AM Suicide with signal {}, message {} delay = {}", signal, text, delay);
ActionHalt action = new ActionHalt(signal, text, delay,