diff --git a/api/src/org/labkey/api/data/Table.java b/api/src/org/labkey/api/data/Table.java index 5b3b76d7b44..ab70c00cfdb 100644 --- a/api/src/org/labkey/api/data/Table.java +++ b/api/src/org/labkey/api/data/Table.java @@ -773,9 +773,12 @@ protected static void _copyUpdateSpecialFields(TableInfo table, Object returnObj _setProperty(returnObject, colVersion.getName(), fields.get(colVersion.getName())); } - static private void _setProperty(Object fields, String propName, Object value) { + // Replace marker NowTimestamp instances with Timestamp for default serialization + if (value instanceof NowTimestamp now) + value = new java.sql.Timestamp(now.getTime()); + if (fields instanceof Map) { ((Map) fields).put(propName, value);