Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ics-software
phoebus
Commits
d37701e7
Unverified
Commit
d37701e7
authored
Sep 08, 2022
by
Kunal Shroff
Committed by
GitHub
Sep 08, 2022
Browse files
Merge pull request #2374 from ControlSystemStudio/CSSTUDIO-1743
Fix wrong time stamp in alarm logger
parents
10b165b8
12831e88
Pipeline
#119980
passed with stage
in 27 minutes and 27 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
services/alarm-logger/src/main/java/org/phoebus/alarm/logging/rest/AlarmLogMessage.java
View file @
d37701e7
...
...
@@ -158,7 +158,7 @@ public class AlarmLogMessage {
public
static
class
AlarmInstantDeserializer
extends
JsonDeserializer
<
Instant
>
{
private
static
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss.SSS"
).
withZone
(
ZoneId
.
systemDefault
(
));
private
static
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss.SSS"
).
withZone
(
ZoneId
.
of
(
"UTC"
));
public
AlarmInstantDeserializer
()
{
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment