You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ka...@apache.org on 2017/07/16 12:04:07 UTC
kylin git commit: KYLIN-2707 Fix NPE in JobInfoConverter
Repository: kylin
Updated Branches:
refs/heads/master 0dc2cd466 -> 0e675cf2c
KYLIN-2707 Fix NPE in JobInfoConverter
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0e675cf2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0e675cf2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0e675cf2
Branch: refs/heads/master
Commit: 0e675cf2cbaa9f2bc9a520aaef82443641efb8ca
Parents: 0dc2cd4
Author: kangkaisen <ka...@live.com>
Authored: Thu Jun 29 20:25:31 2017 +0800
Committer: kangkaisen <ka...@meituan.com>
Committed: Sun Jul 16 20:05:08 2017 +0800
----------------------------------------------------------------------
.../org/apache/kylin/engine/mr/common/JobInfoConverter.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/0e675cf2/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java
index c465e3f..ec5aef1 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/JobInfoConverter.java
@@ -63,11 +63,16 @@ public class JobInfoConverter {
}
public static JobInstance.JobStep parseToJobStep(AbstractExecutable task, int i, Output stepOutput) {
- Preconditions.checkNotNull(stepOutput);
JobInstance.JobStep result = new JobInstance.JobStep();
result.setId(task.getId());
result.setName(task.getName());
result.setSequenceID(i);
+
+ if (stepOutput == null) {
+ result.setStatus(JobStepStatusEnum.ERROR);
+ return result;
+ }
+
result.setStatus(parseToJobStepStatus(stepOutput.getState()));
for (Map.Entry<String, String> entry : stepOutput.getExtra().entrySet()) {
if (entry.getKey() != null && entry.getValue() != null) {