svn commit: r498043 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

[jd...@apache.org]

Author: jdcasey
Date: Fri Jan 19 18:02:47 2007
New Revision: 498043

URL: http://svn.apache.org/viewvc?view=rev&rev=498043
Log:
Adding ability to undo the log-level change, to some extent...it's not too elegant, but it should work in most cases.

Modified:
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=498043&r1=498042&r2=498043
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Fri Jan 19 18:02:47 2007
@@ -59,6 +59,7 @@
 import org.codehaus.plexus.component.repository.exception.ComponentRepositoryException;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.PlexusConfigurationException;
+import org.codehaus.plexus.logging.LoggerManager;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.File;
@@ -565,18 +566,27 @@
 
     public MavenExecutionResult execute( MavenExecutionRequest request )
     {
-        
-        container.getLoggerManager().setThresholds( request.getLoggingLevel() );
+        LoggerManager loggerManager = container.getLoggerManager();
+        int oldThreshold = loggerManager.getThreshold();
         
         try
         {
-            request = defaultsPopulator.populateDefaults( request );
+            loggerManager.setThresholds( request.getLoggingLevel() );
+            
+            try
+            {
+                request = defaultsPopulator.populateDefaults( request );
+            }
+            catch ( MavenEmbedderException e )
+            {
+                return new DefaultMavenExecutionResult( Collections.singletonList( e ) );
+            }
+
+            return maven.execute( request );
         }
-        catch ( MavenEmbedderException e )
+        finally
         {
-            return new DefaultMavenExecutionResult( Collections.singletonList( e ) );
+            loggerManager.setThresholds( oldThreshold );
         }
-
-        return maven.execute( request );
     }
 }