Skip to content

Fix timestamp being invalid if nanoseconds component is zero #3631

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix timestamp being invalid if nanoseconds component is zero #3631

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
6 changes: 3 additions & 3 deletions core/pv-pva/src/main/java/org/phoebus/pv/pva/Decoders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@ static Time decodeTime(final PVAStructure struct)
// In addition, a time stamp of 1990/01/02 00:00:00
// as used for the Channel Access and IOC time stamp epoch
// is considered invalid because IOCs send it for never processed records
final boolean valid = timestamp.getNano() != 0 &&
(timestamp.getEpochSecond() > 0 && timestamp.getEpochSecond() != EPICS_EPOCH);
return Time.of(timestamp, usertag, valid);
final boolean valid = !(timestamp.getEpochSecond() == 0 && timestamp.getNano() == 0) &&
timestamp.getEpochSecond() != EPICS_EPOCH;
return Time.of(timestamp, usertag, valid);
}

/** @param printfFormat Format from NTScalar display.format
Expand Down