Repository: maven-surefire Updated Branches: refs/heads/master 8ce08a7f5 -> dcc84fe8a
[SUREFIRE-1114] NPE in TestSetStats. Concurrency issue with parallel methods on TestNG. Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/dcc84fe8 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/dcc84fe8 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/dcc84fe8 Branch: refs/heads/master Commit: dcc84fe8a65bf4380e72f765e92a824f7e74f10d Parents: 8ce08a7 Author: tibordigana <tibo...@lycos.com> Authored: Fri Nov 7 21:44:57 2014 +0100 Committer: tibordigana <tibo...@lycos.com> Committed: Fri Nov 7 21:44:57 2014 +0100 ---------------------------------------------------------------------- .../apache/maven/plugin/surefire/report/TestSetStats.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/dcc84fe8/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java index 2ff40ba..95e92d4 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java @@ -21,14 +21,19 @@ package org.apache.maven.plugin.surefire.report; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Locale; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; /** * Maintains per-thread test result state. Not thread safe. */ public class TestSetStats { + private final Queue<WrappedReportEntry> reportEntries = new ConcurrentLinkedQueue<WrappedReportEntry>(); + private final boolean trimStackTrace; private final boolean plainFormat; @@ -49,8 +54,6 @@ public class TestSetStats private long elapsedForTestSet; - private final List<WrappedReportEntry> reportEntries = new ArrayList<WrappedReportEntry>(); - public TestSetStats( boolean trimStackTrace, boolean plainFormat ) { this.trimStackTrace = trimStackTrace; @@ -242,7 +245,7 @@ public class TestSetStats return result; } - public List<WrappedReportEntry> getReportEntries() + public Collection<WrappedReportEntry> getReportEntries() { return reportEntries; }
