Merge pull request #2432 from ControlSystemStudio/pva_time_utag

kasemir · web-flow · commit 8fa899b9f139 · 2022-10-28T09:17:09.000-04:00
Prepare timestamp userTag for 64 bit Long
diff --git a/core/pv/src/main/java/org/phoebus/pv/pva/Decoders.java b/core/pv/src/main/java/org/phoebus/pv/pva/Decoders.java
@@ -155,8 +155,10 @@ static Time decodeTime(final PVAStructure struct)
                 timestamp = NO_TIME;
             else
                 timestamp = Instant.ofEpochSecond(sec.get(), nano.get());
-            final PVAInt user = time.get("userTag");
-            usertag = user == null ? NO_USERTAG : user.get();
+            // 2022-10 EPICS Developers meeting proposed 64 bit (Long) userTag
+            // Allow for that, but only use integer until VType is updated
+            final PVANumber user = time.get("userTag");
+            usertag = user == null ? NO_USERTAG : user.getNumber().intValue();
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,10 @@ static Time decodeTime(final PVAStructure struct)`
`155`	`155`	`timestamp = NO_TIME;`
`156`	`156`	`else`
`157`	`157`	`timestamp = Instant.ofEpochSecond(sec.get(), nano.get());`
`158`		`- final PVAInt user = time.get("userTag");`
`159`		`- usertag = user == null ? NO_USERTAG : user.get();`
	`158`	`+ // 2022-10 EPICS Developers meeting proposed 64 bit (Long) userTag`
	`159`	`+ // Allow for that, but only use integer until VType is updated`
	`160`	`+ final PVANumber user = time.get("userTag");`
	`161`	`+ usertag = user == null ? NO_USERTAG : user.getNumber().intValue();`
`160`	`162`	`}`
`161`	`163`	`else`
`162`	`164`	`{`