From 8725222f74727a67f2e37ab4278f057046d0dfe6 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 15 Nov 2018 14:23:45 -0800 Subject: [PATCH 1/3] Watcher: Use joda method to get local TZ This commit switches from using java util's default timezone method to using joda. The former can cause problems when the string representation of the timezone is unknown to joda. closes #35518 --- .../xpack/watcher/trigger/schedule/tool/CronEvalTool.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java index d513bd1cd77f2..9ebc3adc291a1 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import java.util.TimeZone; public class CronEvalTool extends LoggingAwareCommand { @@ -31,7 +30,7 @@ public static void main(String[] args) throws Exception { private static final DateTimeFormatter UTC_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss") .withZone(DateTimeZone.UTC).withLocale(Locale.ROOT); private static final DateTimeFormatter LOCAL_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss Z") - .withZone(DateTimeZone.forTimeZone(TimeZone.getDefault())); + .withZone(DateTimeZone.forTimeZone(null)); private final OptionSpec countOption; private final OptionSpec arguments; From 5bdb7f567cf103144a8131f06a3477274a5afcbb Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 16 Nov 2018 09:33:32 -0800 Subject: [PATCH 2/3] use getDefault --- .../xpack/watcher/trigger/schedule/tool/CronEvalTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java index 9ebc3adc291a1..f4078fc536c1c 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java @@ -30,7 +30,7 @@ public static void main(String[] args) throws Exception { private static final DateTimeFormatter UTC_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss") .withZone(DateTimeZone.UTC).withLocale(Locale.ROOT); private static final DateTimeFormatter LOCAL_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss Z") - .withZone(DateTimeZone.forTimeZone(null)); + .withZone(DateTimeZone.getDefault()); private final OptionSpec countOption; private final OptionSpec arguments; From f8c85d764aab13367bf8a7ee5d8d72caef7d39aa Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 16 Nov 2018 12:39:02 -0800 Subject: [PATCH 3/3] switch back to forTimeZone(null) --- .../xpack/watcher/trigger/schedule/tool/CronEvalTool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java index f4078fc536c1c..9ebc3adc291a1 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/trigger/schedule/tool/CronEvalTool.java @@ -30,7 +30,7 @@ public static void main(String[] args) throws Exception { private static final DateTimeFormatter UTC_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss") .withZone(DateTimeZone.UTC).withLocale(Locale.ROOT); private static final DateTimeFormatter LOCAL_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss Z") - .withZone(DateTimeZone.getDefault()); + .withZone(DateTimeZone.forTimeZone(null)); private final OptionSpec countOption; private final OptionSpec arguments;