You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sh...@apache.org on 2014/03/04 11:08:08 UTC
git commit: FALCON-331 Summary API returning NPE if only start is
passed. Contributed by Shwetha GS
Repository: incubator-falcon
Updated Branches:
refs/heads/master d57c71e6e -> 464442af2
FALCON-331 Summary API returning NPE if only start is passed. Contributed by Shwetha GS
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/464442af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/464442af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/464442af
Branch: refs/heads/master
Commit: 464442af25a87f9b40c6b017f75da8e083449ad1
Parents: d57c71e
Author: Shwetha GS <sh...@gmail.com>
Authored: Tue Mar 4 15:38:00 2014 +0530
Committer: Shwetha GS <sh...@gmail.com>
Committed: Tue Mar 4 15:38:00 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/falcon/workflow/engine/OozieWorkflowEngine.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/464442af/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fa9820c..237646c 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -57,6 +57,8 @@ Trunk (Unreleased)
FALCON-123 Improve build speeds in falcon. (Srikanth Sundarrajan via Shwetha GS)
BUG FIXES
+ FALCON-331 Summary API returning NPE if only start is passed. (Shwetha GS)
+
FALCON-323 Summary API deserialization fails if array has only one element.
(Shwetha GS via Shaik Idris)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/464442af/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
index 9372ba4..328cd82 100644
--- a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
+++ b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
@@ -564,7 +564,8 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
Frequency freq = createFrequency(String.valueOf(coord.getFrequency()), coord.getTimeUnit());
TimeZone tz = EntityUtil.getTimeZone(coord.getTimeZone());
Date iterStart = EntityUtil.getNextStartTime(coord.getStartTime(), freq, tz, start);
- Date iterEnd = (coord.getLastActionTime().before(end) ? coord.getLastActionTime() : end);
+ Date iterEnd = (coord.getLastActionTime() != null && coord.getLastActionTime().before(end) ?
+ coord.getLastActionTime() : end);
if (i == (applicableCoords.size() - 1)) {
isLastCoord = true;