From 5bb483ffcd8fd71a497d8214026fa7885c729495 Mon Sep 17 00:00:00 2001
From: Ross Titmarsh <23349806+rosstitmarsh@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:20:57 +0000
Subject: [PATCH] Fixed timestamp being invalid if nanoseconds component is
 zero #3463

---
 core/pv-pva/src/main/java/org/phoebus/pv/pva/Decoders.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pv-pva/src/main/java/org/phoebus/pv/pva/Decoders.java b/core/pv-pva/src/main/java/org/phoebus/pv/pva/Decoders.java
index 11c78f3e3a..98b33f1961 100644
--- a/core/pv-pva/src/main/java/org/phoebus/pv/pva/Decoders.java
+++ b/core/pv-pva/src/main/java/org/phoebus/pv/pva/Decoders.java
@@ -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