You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pb...@apache.org on 2016/12/13 13:19:50 UTC
[19/48] oozie git commit: OOZIE-2690 OOZIE NPE while executing kill()
(abhishekbafna via jaydeepvishwakarma)
OOZIE-2690 OOZIE NPE while executing kill() (abhishekbafna via jaydeepvishwakarma)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/05337002
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/05337002
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/05337002
Branch: refs/heads/oya
Commit: 05337002fc50d78750979dc15ecea5ad80c14931
Parents: 1d54e47
Author: jvishwakarma <jv...@walmartlabs.com>
Authored: Mon Nov 21 12:01:39 2016 +0530
Committer: jvishwakarma <jv...@walmartlabs.com>
Committed: Mon Nov 21 12:01:39 2016 +0530
----------------------------------------------------------------------
.../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/05337002/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 65996d9..f315af7 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
@@ -1410,7 +1410,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/05337002/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;
}