Repository: oozie Updated Branches: refs/heads/branch-4.3 79fac26ab -> c2d4a14a2
OOZIE-2690 OOZIE NPE while executing kill() (abhishekbafna via jaydeepvishwakarma) (cherry picked from commit 05337002fc50d78750979dc15ecea5ad80c14931) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/96f57b9e Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/96f57b9e Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/96f57b9e Branch: refs/heads/branch-4.3 Commit: 96f57b9ee945a66583c563ec2b1d691f119fc297 Parents: 79fac26 Author: jvishwakarma <jvishwaka...@walmartlabs.com> Authored: Mon Nov 21 12:01:39 2016 +0530 Committer: satishsaley <satishsa...@apache.org> Committed: Fri Dec 8 16:33:57 2017 -0800 ---------------------------------------------------------------------- .../org/apache/oozie/action/hadoop/JavaActionExecutor.java | 6 +++++- .../apache/oozie/action/hadoop/MapReduceActionExecutor.java | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/96f57b9e/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index 31d4817..4beeb96 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -1413,7 +1413,11 @@ public class JavaActionExecutor extends ActionExecutor { } protected RunningJob getRunningJob(Context context, WorkflowAction action, JobClient jobClient) throws Exception{ - RunningJob runningJob = jobClient.getJob(JobID.forName(action.getExternalId())); + String externalId = action.getExternalId(); + RunningJob runningJob = null; + if (externalId != null) { + runningJob = jobClient.getJob(JobID.forName(externalId)); + } return runningJob; } http://git-wip-us.apache.org/repos/asf/oozie/blob/96f57b9e/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java index c36a675..55c9372 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java @@ -335,12 +335,11 @@ public class MapReduceActionExecutor extends JavaActionExecutor { @Override protected RunningJob getRunningJob(Context context, WorkflowAction action, JobClient jobClient) throws Exception{ - - RunningJob runningJob; + RunningJob runningJob = null; String jobId = getActualExternalId(action); - - runningJob = jobClient.getJob(JobID.forName(jobId)); - + if (jobId != null) { + runningJob = jobClient.getJob(JobID.forName(jobId)); + } return runningJob; }
