svn commit: r1419173 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java

[krosenvold]

Author: krosenvold
Date: Sun Dec  9 22:09:51 2012
New Revision: 1419173

URL: http://svn.apache.org/viewvc?rev=1419173&view=rev
Log:
o Removed threadlocal until use case is proven

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=1419173&r1=1419172&r2=1419173&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
 Sun Dec  9 22:09:51 2012
@@ -114,7 +114,7 @@ public class Verifier
 
     private boolean debugJvm = false;
 
-    private static ThreadLocal<MavenLauncher> embeddedLauncher = new 
ThreadLocal<MavenLauncher>();
+    private static MavenLauncher embeddedLauncher;
 
     public Verifier( String basedir )
         throws VerificationException
@@ -1359,7 +1359,7 @@ public class Verifier
             {
                 initEmbeddedLauncher();
 
-                ret = embeddedLauncher.get().run( cliArgs, getBasedir(), 
logFile );
+                ret = embeddedLauncher.run( cliArgs, getBasedir(), logFile );
             }
             else
             {
@@ -1391,15 +1391,15 @@ public class Verifier
     private void initEmbeddedLauncher()
         throws LauncherException
     {
-        if ( embeddedLauncher.get() == null )
+        if ( embeddedLauncher == null )
         {
             if ( StringUtils.isEmpty( defaultMavenHome ) )
             {
-                embeddedLauncher.set( new Classpath3xLauncher() );
+                embeddedLauncher = new Classpath3xLauncher();
             }
             else
             {
-                embeddedLauncher.set( new Embedded3xLauncher( defaultMavenHome 
) );
+                embeddedLauncher = new Embedded3xLauncher( defaultMavenHome );
             }
         }
     }