fix workflow/BST issue
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/cbd9d0d6 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/cbd9d0d6 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/cbd9d0d6 Branch: refs/heads/avro_rpc Commit: cbd9d0d685220369441c30622afc1bf7183e7b11 Parents: bb6358f Author: Tom Barber <[email protected]> Authored: Wed Jul 6 15:31:00 2016 +0100 Committer: Tom Barber <[email protected]> Committed: Wed Jul 6 15:31:00 2016 +0100 ---------------------------------------------------------------------- commons/pom.xml | 5 +++++ .../src/main/java/org/apache/oodt/commons/util/DateConvert.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/cbd9d0d6/commons/pom.xml ---------------------------------------------------------------------- diff --git a/commons/pom.xml b/commons/pom.xml index 1d9ee9b..593f55c 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -94,6 +94,11 @@ <groupId>xmlrpc</groupId> <artifactId>xmlrpc</artifactId> </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>2.9.4</version> + </dependency> </dependencies> <build> <resources> http://git-wip-us.apache.org/repos/asf/oodt/blob/cbd9d0d6/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java ---------------------------------------------------------------------- diff --git a/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java b/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java index 8eae030..9dd53d0 100644 --- a/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java +++ b/commons/src/main/java/org/apache/oodt/commons/util/DateConvert.java @@ -107,7 +107,7 @@ public class DateConvert { // onto the formatted date/time string. TimeZone tz = dateFormat.getTimeZone(); String tzName = tz.getDisplayName(); - if (tzName.equals("Greenwich Mean Time")) { + if (tzName.equals("Greenwich Mean Time") && !TimeZone.getDefault().inDaylightTime( inputDate )) { dateString = dateString.concat("Z"); } else {
