falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From venkat...@apache.org
Subject [1/6] git commit: FALCON-336 FALCON-331 introduced a check style error - builds fail. Contributed by Venkatesh Seetharam
Date Thu, 06 Mar 2014 00:49:37 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 464442af2 -> b8b2fe45d


FALCON-336 FALCON-331 introduced a check style error - builds fail. Contributed by Venkatesh
Seetharam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/42d04f37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/42d04f37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/42d04f37

Branch: refs/heads/master
Commit: 42d04f37feaeee26fd6239dfa275173660a331f9
Parents: 464442a
Author: Venkatesh Seetharam <venkatesh@hortonworks.com>
Authored: Wed Mar 5 15:45:15 2014 -0800
Committer: Venkatesh Seetharam <venkatesh@hortonworks.com>
Committed: Wed Mar 5 15:45:15 2014 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                      | 2 ++
 .../org/apache/falcon/workflow/engine/OozieWorkflowEngine.java   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42d04f37/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 237646c..6b536b8 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -118,6 +118,8 @@ Trunk (Unreleased)
     FALCON-226 Tests for subscribing/listening to multiple active-mq topics.  (Shaik Idris

     via Shwetha GS)
 
+    FALCON-336 Fix check style error - builds fail (Venkatesh Seetharam)
+
 Release Version: 0.4-incubating
 
    NEW FEATURES

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/42d04f37/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 328cd82..dee77c0 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,8 +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() != null && 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;


Mime
View raw message