Repository: falcon Updated Branches: refs/heads/master 4aa036e68 -> adf53c86f
FALCON-1097 UT failure for ExpressionHelperTest. Contributed by Ajay Yadava. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/adf53c86 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/adf53c86 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/adf53c86 Branch: refs/heads/master Commit: adf53c86f9f6e2af8f44d31f0ad1523c401e57ac Parents: 4aa036e Author: shaik.idris <[email protected]> Authored: Wed Apr 1 13:15:38 2015 +0530 Committer: shaik.idris <[email protected]> Committed: Wed Apr 1 13:15:38 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../main/java/org/apache/falcon/expression/ExpressionHelper.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/adf53c86/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0973a67..6f7e992 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -127,6 +127,9 @@ Trunk (Unreleased) (Suhas vasu) BUG FIXES + FALCON-1097 UT failure for ExpressionHelperTest + (Ajay Yadava via Shaik Idris) + FALCON-1125 Feed Lookup API doesnt work via prism (Ajay Yadava via Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/adf53c86/common/src/main/java/org/apache/falcon/expression/ExpressionHelper.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/expression/ExpressionHelper.java b/common/src/main/java/org/apache/falcon/expression/ExpressionHelper.java index 33ec59c..2b50119 100644 --- a/common/src/main/java/org/apache/falcon/expression/ExpressionHelper.java +++ b/common/src/main/java/org/apache/falcon/expression/ExpressionHelper.java @@ -123,6 +123,7 @@ public final class ExpressionHelper implements FunctionMapper, VariableResolver private static int getDayOffset(String weekDayName) { int day; Calendar nominalTime = Calendar.getInstance(); + nominalTime.setTimeZone(TimeZone.getTimeZone("UTC")); nominalTime.setTime(referenceDate.get()); int currentWeekDay = nominalTime.get(Calendar.DAY_OF_WEEK); int weekDay = DayOfWeek.valueOf(weekDayName).ordinal() + 1; //to map to Calendar.SUNDAY ...
