This is an automated email from the ASF dual-hosted git repository. ijokarumawak pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push: new 00f0f84 NIFI-6508 - Fix test failure caused by timezone and/or DST difference 00f0f84 is described below commit 00f0f84856226ac39c92807c01945bb017e99bb4 Author: Malthe Borch <mbo...@gmail.com> AuthorDate: Wed Jul 31 11:09:44 2019 +0200 NIFI-6508 - Fix test failure caused by timezone and/or DST difference Signed-off-by: Koji Kawamura <ijokaruma...@apache.org> --- .../status/history/VolatileComponentStatusRepositoryTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryTest.java index e7532ff..dad852a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryTest.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/status/history/VolatileComponentStatusRepositoryTest.java @@ -17,7 +17,7 @@ package org.apache.nifi.controller.status.history; import java.time.LocalDateTime; -import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.Date; import java.util.List; @@ -75,7 +75,7 @@ public class VolatileComponentStatusRepositoryTest { } private Date asDate(LocalDateTime localDateTime) { - return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + return Date.from(localDateTime.toInstant(ZoneOffset.UTC)); } @Test