From 54603aa1b72bfbdd04d69f0f0bf5dcfeb9dcda92 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 27 Feb 2023 18:13:27 +0000
Subject: [PATCH] 8303208: JFR: 'jfr print' displays incorrect timestamps

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/internal/MetadataDescriptor.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataDescriptor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataDescriptor.java
index b9ee3129248..db2d1b2b8c8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataDescriptor.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataDescriptor.java
@@ -29,6 +29,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -262,7 +263,11 @@ public final class MetadataDescriptor {
         m.locale = Locale.getDefault().toString();
         TimeZone tz = TimeZone.getDefault();
         m.gmtOffset = tz.getRawOffset();
-        m.dst = tz.getDSTSavings();
+        if (tz.inDaylightTime(new Date())) {
+            m.dst = tz.getDSTSavings();
+        } else {
+            m.dst = 0;
+        }
         m.types.addAll(types);
         MetadataWriter w = new MetadataWriter(m);
         w.writeBinary(output);