Skip to content

Commit bad0196

Browse files
committed
Prepare timestamp userTag for 64 bit Long
Only using as integer until IOC and VType update, but will now handle a received 64 bit userTag without crashing
1 parent 588f2ce commit bad0196

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

core/pv/src/main/java/org/phoebus/pv/pva/Decoders.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,10 @@ static Time decodeTime(final PVAStructure struct)
155155
timestamp = NO_TIME;
156156
else
157157
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();
160162
}
161163
else
162164
{

0 commit comments

Comments
 (0)