From 6b51007577170c81989e0084a82ad8c88d0b4d6b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Mon, 16 Mar 2015 12:18:17 +0100 Subject: Fix an issue with TimeZone ID of UTC Conflicts: server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java --- sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sonar-plugin-api') diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java index 964df41ed0d..27c5cc3e206 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/System2.java @@ -28,6 +28,7 @@ import javax.annotation.CheckForNull; import java.util.Date; import java.util.Map; import java.util.Properties; +import java.util.TimeZone; /** * Proxy over {@link java.lang.System}. It aims to improve testability of classes @@ -126,6 +127,14 @@ public class System2 implements BatchComponent, ServerComponent { return new Date(); } + /** + * @since 5.1 + * @return the JVM's default time zone + */ + public TimeZone getDefaultTimeZone() { + return TimeZone.getDefault(); + } + /** * Closes the object and throws an {@link java.lang.IllegalStateException} on error. * @since 5.1 -- cgit v1.2.3