Repository: oozie Updated Branches: refs/heads/branch-4.1 000e007d7 -> c1a277dcc
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/c1a277dc Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c1a277dc Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c1a277dc Branch: refs/heads/branch-4.1 Commit: c1a277dccfd33962b89bf3b3b41a7cbe4b66b028 Parents: 000e007 Author: Robert Kanter <[email protected]> Authored: Fri Sep 5 16:34:44 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Sep 5 16:34:44 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/c1a277dc/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 a5db84a..c0b6a2f 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 @@ -726,8 +726,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); @@ -736,6 +736,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/c1a277dc/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 85fdef4..2e14e5c 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-1989 NPE during a rerun with forks (rkanter) OOZIE-1923 ZKLocksService locks are not re-entrant like MemoryLocks (puru) OOZIE-1945 NPE in JaveActionExecutor#check() (sree2k via rkanter) OOZIE-1984 SLACalculator in HA mode performs duplicate operations on records with completed jobs (mona)
