Skip to content

Commit bce3baa

Browse files
committed
Ensure that Telescope.UTCDate returns a dateTime value that has the UTC flag set.
1 parent aaa769f commit bce3baa

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

Remote Server/ServerForm.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5940,7 +5940,8 @@ private void ReturnDateTime(RequestData requestData)
59405940
switch (requestData.Elements[SharedConstants.URL_ELEMENT_DEVICE_TYPE] + "." + requestData.Elements[SharedConstants.URL_ELEMENT_METHOD])
59415941
{
59425942
case "telescope.utcdate":
5943-
deviceResponse = device.UTCDate; break;
5943+
deviceResponse = device.UTCDate;
5944+
break;
59445945

59455946
default:
59465947
LogMessage1(requestData, "ReturnDateTime", "Unsupported method: " + requestData.Elements[SharedConstants.URL_ELEMENT_METHOD]);
@@ -5952,6 +5953,9 @@ private void ReturnDateTime(RequestData requestData)
59525953
exReturn = ex;
59535954
}
59545955

5956+
// Ensure the DateTime is in UTC format so that it de-serialises correctly in the client application
5957+
deviceResponse = DateTime.SpecifyKind(deviceResponse, DateTimeKind.Utc);
5958+
59555959
DateTimeResponse responseClass = new(requestData.ClientTransactionID, requestData.ServerTransactionID, deviceResponse)
59565960
{
59575961
DriverException = exReturn,

0 commit comments

Comments
 (0)