Author: fschumacher
Date: Sat Mar 19 12:09:23 2016
New Revision: 1735762
URL: http://svn.apache.org/viewvc?rev=1735762&view=rev
Log:
Reuse collection that could have been added by another thread a moment earlier.
Modified:
jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java?rev=1735762&r1=1735761&r2=1735762&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java Sat Mar
19 12:09:23 2016
@@ -34,6 +34,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import javax.swing.JFrame;
import javax.swing.JLabel;
@@ -55,7 +56,7 @@ public class FileReporter extends JPanel
private static final Logger log = LoggingManager.getLoggerForClass();
- private final Map<String, List<Integer>> data = new ConcurrentHashMap<>();
+ private final ConcurrentMap<String, List<Integer>> data = new
ConcurrentHashMap<>();
/**
* Initialize a file reporter from a file
@@ -99,7 +100,10 @@ public class FileReporter extends JPanel
if (v == null) {
v = Collections.synchronizedList(new
ArrayList<Integer>());
- this.data.put(key, v);
+ List<Integer> currentList = this.data.putIfAbsent(key,
v);
+ if (currentList != null) {
+ v = currentList;
+ }
}
v.add(value);
} catch (NumberFormatException nfe) {
