Repository: maven-surefire Updated Branches: refs/heads/master c43ff3e73 -> cfb6177f5
[SUREFIRE] AtomicInteger instead of volatile number with pre/post increment Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cfb6177f Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cfb6177f Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cfb6177f Branch: refs/heads/master Commit: cfb6177f5279038f422fd8ea8569f01b35848a66 Parents: c43ff3e Author: Tibor17 <tibo...@lycos.com> Authored: Fri Jan 15 16:36:20 2016 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Fri Jan 15 16:36:20 2016 +0100 ---------------------------------------------------------------------- .../plugin/surefire/report/StatelessXmlReporterTest.java | 6 +++--- .../apache/maven/surefire/booter/ForkingReporterFactory.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cfb6177f/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java index 09fa1d1..e82515e 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java @@ -37,6 +37,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; @SuppressWarnings( "ResultOfMethodCallIgnored" ) public class StatelessXmlReporterTest @@ -53,8 +54,7 @@ public class StatelessXmlReporterTest private final static String TEST_ONE = "aTestMethod"; private final static String TEST_TWO = "bTestMethod"; private final static String TEST_THREE = "cTestMethod"; - - private static volatile int folderPostfix; + private static final AtomicInteger FOLDER_POSTFIX = new AtomicInteger(); @Override protected void setUp() @@ -66,7 +66,7 @@ public class StatelessXmlReporterTest File basedir = new File( "." ); File target = new File( basedir.getCanonicalFile(), "target" ); target.mkdir(); - String reportRelDir = getClass().getSimpleName() + "-" + ++folderPostfix; + String reportRelDir = getClass().getSimpleName() + "-" + FOLDER_POSTFIX.incrementAndGet(); reportDir = new File( target, reportRelDir ); reportDir.mkdir(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cfb6177f/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java index 8108609..def345d 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingReporterFactory.java @@ -20,6 +20,8 @@ package org.apache.maven.surefire.booter; */ import java.io.PrintStream; +import java.util.concurrent.atomic.AtomicInteger; + import org.apache.maven.surefire.report.ReporterFactory; import org.apache.maven.surefire.report.RunListener; import org.apache.maven.surefire.suite.RunResult; @@ -35,12 +37,11 @@ import org.apache.maven.surefire.suite.RunResult; public class ForkingReporterFactory implements ReporterFactory { - private final boolean isTrimstackTrace; private final PrintStream originalSystemOut; - private volatile int testSetChannelId = 1; + private final AtomicInteger testSetChannelId = new AtomicInteger( 1 ); public ForkingReporterFactory( boolean trimstackTrace, PrintStream originalSystemOut ) { @@ -50,7 +51,7 @@ public class ForkingReporterFactory public RunListener createReporter() { - return new ForkingRunListener( originalSystemOut, testSetChannelId++, isTrimstackTrace ); + return new ForkingRunListener( originalSystemOut, testSetChannelId.getAndIncrement(), isTrimstackTrace ); } public RunResult close()
