Repository: incubator-slider Updated Branches: refs/heads/develop 81cd546bd -> a0b00f0d0
SLIDER-659 NPE in slider am-suicide if you don't provide a message Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6490bd7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6490bd7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6490bd7c Branch: refs/heads/develop Commit: 6490bd7cf50d132e5dd7ae7ea0ec6ad85872c0aa Parents: 81cd546 Author: Steve Loughran <[email protected]> Authored: Wed Nov 19 16:32:49 2014 +0100 Committer: Steve Loughran <[email protected]> Committed: Wed Nov 19 16:32:49 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/slider/client/SliderClusterOperations.java | 4 +++- .../org/apache/slider/common/params/ActionAMSuicideArgs.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6490bd7c/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java b/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java index 30f17b6..fe44f22 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClusterOperations.java @@ -312,7 +312,9 @@ public class SliderClusterOperations { IOException { Messages.AMSuicideRequestProto.Builder builder = Messages.AMSuicideRequestProto.newBuilder(); - builder.setText(text); + if (text != null) { + builder.setText(text); + } builder.setSignal(signal); builder.setDelay(delay); Messages.AMSuicideRequestProto req = http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6490bd7c/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java index 5d889e1..d6cabf5 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionAMSuicideArgs.java @@ -33,7 +33,7 @@ public class ActionAMSuicideArgs extends AbstractActionArgs { @Parameter(names = {ARG_MESSAGE}, description = "reason for the action") - public String message; + public String message = ""; @Parameter(names = {ARG_EXITCODE}, description = "exit code")
