Backport a data-race fix that could prevent profiles from being captu…

…red.
neo4j · Apr 2, 2019 · dadb6a9 · dadb6a9
1 parent f9c012a
commit dadb6a9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/community/io/src/test/java/org/neo4j/test/rule/SamplingProfiler.java b/community/io/src/test/java/org/neo4j/test/rule/SamplingProfiler.java
@@ -20,10 +20,10 @@
 package org.neo4j.test.rule;
 
 import java.io.PrintStream;
-import java.util.ArrayList;
 import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -33,7 +33,7 @@ class SamplingProfiler implements Profiler
 {
     private static final long DEFAULT_SAMPLE_INTERVAL_NANOS = TimeUnit.MILLISECONDS.toNanos( 1 );
 
-    private final ArrayList<Thread> samplerThreads = new ArrayList<>();
+    private final ConcurrentLinkedQueue<Thread> samplerThreads = new ConcurrentLinkedQueue<>();
     private final AtomicBoolean stopped = new AtomicBoolean();
     private final ConcurrentHashMap<Thread,Sample> samples = new ConcurrentHashMap<>();
     private final AtomicLong sampleIntervalNanos = new AtomicLong( DEFAULT_SAMPLE_INTERVAL_NANOS );
@@ -51,7 +51,8 @@ public void reset()
     public void finish() throws InterruptedException
     {
         stopped.set( true );
-        for ( Thread thread : samplerThreads )
+        Thread thread;
+        while ( (thread = samplerThreads.poll()) != null )
         {
             thread.interrupt();
             thread.join();