Skip to content

Fix NullPointerException in the "after the last transition" case #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix NullPointerException in the "after the last transition" case #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/main/java/net/logstash/logback/composite/FastISOTimestampFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.zone.ZoneOffsetTransition;
import java.time.zone.ZoneRules;
import java.util.List;

/**
* A fast alternative to DateTimeFormatter when formatting millis using an ISO format.
Expand Down Expand Up @@ -167,12 +169,13 @@ private class ZoneOffsetState {

Instant now = Instant.ofEpochMilli(timestampInMillis);
ZoneOffset zoneOffset;


ZoneRules rules = zoneId.getRules();
/*
* The Zone has a fixed offset that will never change.
*/
if (zoneId.getRules().isFixedOffset()) {
zoneOffset = zoneId.getRules().getOffset(now);
if (rules.isFixedOffset()) {
zoneOffset = rules.getOffset(now);
this.zoneTransitionStart = 0;
this.zoneTransitionStop = Long.MAX_VALUE;
}
Expand All @@ -181,7 +184,12 @@ private class ZoneOffsetState {
* and how long it is valid.
*/
else {
ZoneOffsetTransition zoneOffsetTransition = zoneId.getRules().nextTransition(now);
ZoneOffsetTransition zoneOffsetTransition = rules.nextTransition(now);
if (zoneOffsetTransition == null) {
List<ZoneOffsetTransition> transitions = rules.getTransitions();
zoneOffsetTransition = transitions.get(transitions.size() - 1);
}

this.zoneTransitionStart = timestampInMillis;
this.zoneTransitionStop = zoneOffsetTransition.toEpochSecond() * 1_000;
zoneOffset = zoneOffsetTransition.getOffsetBefore();
Expand Down
11 changes: 9 additions & 2 deletions src/test/java/net/logstash/logback/composite/FastISOTimestampFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatNoException;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -267,8 +268,14 @@ protected ZoneRules provideRules(String zoneId, boolean forCaching) {
assertThat(invokeTwice(fast, after.toInstant())).isEqualTo(formatter.format(after));
});
}



/*
* Assert after the last transitions are not exception
*/
@Test
public void afterTheLastTransition() {
assertThatNoException().isThrownBy(() -> FastISOTimestampFormatter.isoOffsetDateTime(ZoneId.of("Asia/Bangkok")));
}

/*
* Invoke same formatter from concurrent threads. Force invalidation of the cache by making
Expand Down