Repository: oozie Updated Branches: refs/heads/master 60212d4d2 -> c270a20c3
OOZIE-1989 NPE during a rerun with forks (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c270a20c Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c270a20c Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c270a20c Branch: refs/heads/master Commit: c270a20c3819a04cfa368f2dc34e0a98484f2c9c Parents: 60212d4 Author: Robert Kanter <[email protected]> Authored: Fri Sep 5 16:34:09 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Sep 5 16:34:09 2014 -0700 ---------------------------------------------------------------------- .../org/apache/oozie/workflow/lite/LiteWorkflowInstance.java | 6 ++++-- release-log.txt | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c270a20c/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java index fb823e2..919c95a 100644 --- a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java +++ b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowInstance.java @@ -727,8 +727,8 @@ public class LiteWorkflowInstance implements Writable, WorkflowInstance { @Override public int compare(String node1, String node2) { - Date date1 = FAR_INTO_THE_FUTURE; - Date date2 = FAR_INTO_THE_FUTURE; + Date date1 = null; + Date date2 = null; NodeInstance node1Instance = executionPaths.get(node1); if (node1Instance != null) { date1 = this.actionEndTimes.get(node1Instance.nodeName); @@ -737,6 +737,8 @@ public class LiteWorkflowInstance implements Writable, WorkflowInstance { if (node2Instance != null) { date2 = this.actionEndTimes.get(node2Instance.nodeName); } + date1 = (date1 == null) ? FAR_INTO_THE_FUTURE : date1; + date2 = (date2 == null) ? FAR_INTO_THE_FUTURE : date2; return date1.compareTo(date2); } http://git-wip-us.apache.org/repos/asf/oozie/blob/c270a20c/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 0435249..bace76f 100644 --- a/release-log.txt +++ b/release-log.txt @@ -15,6 +15,7 @@ OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang) -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-1989 NPE during a rerun with forks (rkanter) OOZIE-1945 NPE in JaveActionExecutor#check() (sree2k via rkanter) OOZIE-1984 SLACalculator in HA mode performs duplicate operations on records with completed jobs (mona) OOZIE-1958 address duplication of env variables in oozie.launcher.yarn.app.mapreduce.am.env when running with uber mode (ryota)
