Skip to content
Snippets Groups Projects
Commit 1c326c4e authored by Ivan Frade's avatar Ivan Frade Committed by Gerrit Code Review
Browse files

Merge "SystemReader: Give a default implementation to #getTimezoneAt()"

parents 6cf5d194 c64bc936
No related branches found
No related tags found
No related merge requests found
......@@ -244,11 +244,6 @@ public int getTimezone(long when) {
return getTimeZone().getOffset(when) / (60 * 1000);
}
@Override
public ZoneOffset getTimeZoneAt(Instant when) {
return getTimeZoneId().getRules().getOffset(when);
}
@Override
public TimeZone getTimeZone() {
return TimeZone.getTimeZone("GMT-03:30");
......
......@@ -178,11 +178,6 @@ public Instant now() {
public int getTimezone(long when) {
return getTimeZone().getOffset(when) / (60 * 1000);
}
@Override
public ZoneOffset getTimeZoneAt(Instant when) {
return getTimeZoneId().getRules().getOffset(when);
}
}
/**
......@@ -569,7 +564,9 @@ public MonotonicClock getClock() {
* @return the local time zone
* @since 7.1
*/
public abstract ZoneOffset getTimeZoneAt(Instant when);
public ZoneOffset getTimeZoneAt(Instant when) {
return getTimeZoneId().getRules().getOffset(when);
}
/**
* Get system time zone, possibly mocked for testing
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment