Author: krosenvold Date: Tue Dec 4 06:12:47 2012 New Revision: 1416791 URL: http://svn.apache.org/viewvc?rev=1416791&view=rev Log: o Made verifier thread safe
Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=1416791&r1=1416790&r2=1416791&view=diff ============================================================================== --- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original) +++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Tue Dec 4 06:12:47 2012 @@ -113,7 +113,7 @@ public class Verifier private boolean debugJvm = false; - private static MavenLauncher embeddedLauncher; + private static ThreadLocal<MavenLauncher> embeddedLauncher = new ThreadLocal<MavenLauncher>(); public Verifier( String basedir ) throws VerificationException @@ -153,7 +153,9 @@ public class Verifier this.debug = debug; this.forkJvm = forkJvm; - this.forkMode = System.getProperty( "verifier.forkMode" ); + this. + + forkMode = System.getProperty( "verifier.forkMode" ); if ( !debug ) { @@ -1332,7 +1334,7 @@ public class Verifier { initEmbeddedLauncher(); - ret = embeddedLauncher.run( cliArgs, getBasedir(), logFile ); + ret = embeddedLauncher.get().run( cliArgs, getBasedir(), logFile ); } else { @@ -1364,15 +1366,15 @@ public class Verifier private void initEmbeddedLauncher() throws LauncherException { - if ( embeddedLauncher == null ) + if ( embeddedLauncher.get() == null ) { if ( StringUtils.isEmpty( defaultMavenHome ) ) { - embeddedLauncher = new Classpath3xLauncher(); + embeddedLauncher.set( new Classpath3xLauncher()); } else { - embeddedLauncher = new Embedded3xLauncher( defaultMavenHome ); + embeddedLauncher.set( new Embedded3xLauncher( defaultMavenHome )); } } }