From a653ff48933bfd72c7c3d004ccc5bd0d9c1162cb Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Wed, 4 Jun 2025 13:39:31 +0000
Subject: [PATCH] 8358536: jdk/jfr/api/consumer/TestRecordingFileWrite.java
 times out

Reviewed-by: mgronlun
---
 .../classes/jdk/jfr/internal/tool/PrettyWriter.java      | 9 ++++++---
 test/jdk/ProblemList.txt                                 | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
index 274a21d9b49..10f50095247 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/PrettyWriter.java
@@ -117,11 +117,11 @@ public final class PrettyWriter extends EventPrintWriter {
     // At the same time, a too large window, means it will take more time
     // before the first event is printed and the tool will feel unresponsive.
     private static final int EVENT_WINDOW_SIZE = 1_000_000;
-    private final PriorityQueue<Timestamp> timeline = new PriorityQueue<>(EVENT_WINDOW_SIZE + 4);
-    private final Map<Long, TypeInformation> typeInformation = new HashMap<>();
-    private final Map<Long, SequencedSet<RecordedEvent>> contexts = new HashMap<>();
     private final boolean showExact;
     private RecordedEvent currentEvent;
+    private PriorityQueue<Timestamp> timeline;
+    private Map<Long, TypeInformation> typeInformation;
+    private Map<Long, SequencedSet<RecordedEvent>> contexts;
 
     public PrettyWriter(PrintWriter destination, boolean showExact) {
         super(destination);
@@ -133,6 +133,9 @@ public final class PrettyWriter extends EventPrintWriter {
     }
 
     void print(Path source) throws IOException {
+        timeline = new PriorityQueue<>(EVENT_WINDOW_SIZE + 4);
+        typeInformation = new HashMap<>();
+        contexts = new HashMap<>();
         printBegin();
         int counter = 0;
         try (RecordingFile file = new RecordingFile(source)) {
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index f44dd5c7a7d..28bb2a1f033 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -774,7 +774,6 @@ jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-
 jdk/jfr/event/oldobject/TestShenandoah.java                     8342951 generic-all
 jdk/jfr/event/runtime/TestResidentSetSizeEvent.java             8309846 aix-ppc64
 jdk/jfr/jvm/TestWaste.java                                      8282427 generic-all
-jdk/jfr/api/consumer/TestRecordingFileWrite.java                8358536 generic-all
 
 ############################################################################