You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by kr...@apache.org on 2010/12/04 20:59:39 UTC
svn commit: r1042230 - in
/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient:
ForkStarter.java output/SynchronizedOutputConsumer.java
Author: krosenvold
Date: Sat Dec 4 19:59:39 2010
New Revision: 1042230
URL: http://svn.apache.org/viewvc?rev=1042230&view=rev
Log:
o Removed unecessary synchronization.
I overdid things slightly when trying to fix the build on grid. This
shouldn't be necessary
Removed:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/SynchronizedOutputConsumer.java
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java?rev=1042230&r1=1042229&r2=1042230&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java Sat Dec 4 19:59:39 2010
@@ -24,7 +24,6 @@ import org.apache.maven.plugin.surefire.
import org.apache.maven.plugin.surefire.booterclient.output.StandardOutputConsumer;
import org.apache.maven.plugin.surefire.booterclient.output.SupressFooterOutputConsumerProxy;
import org.apache.maven.plugin.surefire.booterclient.output.SupressHeaderOutputConsumerProxy;
-import org.apache.maven.plugin.surefire.booterclient.output.SynchronizedOutputConsumer;
import org.apache.maven.surefire.booter.BooterConfiguration;
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.ProviderConfiguration;
@@ -199,13 +198,11 @@ public class ForkStarter
final boolean willBeSharingConsumer = starterConfiguration.isRedirectTestOutputToFile();
ForkingStreamConsumer out =
- getForkingStreamConsumer( showHeading, showFooter, starterConfiguration.isRedirectTestOutputToFile(),
- willBeSharingConsumer );
+ getForkingStreamConsumer( showHeading, showFooter, starterConfiguration.isRedirectTestOutputToFile() );
StreamConsumer err = willBeSharingConsumer
? out
- : getForkingStreamConsumer( showHeading, showFooter, starterConfiguration.isRedirectTestOutputToFile(),
- willBeSharingConsumer );
+ : getForkingStreamConsumer( showHeading, showFooter, starterConfiguration.isRedirectTestOutputToFile() );
if ( forkConfiguration.isDebug() )
{
@@ -263,7 +260,7 @@ public class ForkStarter
}
private ForkingStreamConsumer getForkingStreamConsumer( boolean showHeading, boolean showFooter,
- boolean redirectTestOutputToFile, boolean mustBeThreadSafe )
+ boolean redirectTestOutputToFile )
{
OutputConsumer outputConsumer = new StandardOutputConsumer();
@@ -282,11 +279,6 @@ public class ForkStarter
outputConsumer = new SupressFooterOutputConsumerProxy( outputConsumer );
}
- if ( mustBeThreadSafe )
- {
- outputConsumer = new SynchronizedOutputConsumer( outputConsumer );
- }
-
return new ForkingStreamConsumer( outputConsumer );
}