You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/07/28 22:14:14 UTC
svn commit: r798696 -
/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Author: brett
Date: Tue Jul 28 20:14:13 2009
New Revision: 798696
URL: http://svn.apache.org/viewvc?rev=798696&view=rev
Log:
move offline check into resolveParameters to avoid duplication of wagon manager lookup
Modified:
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified: maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=798696&r1=798695&r2=798696&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue Jul 28 20:14:13 2009
@@ -244,35 +244,6 @@
private ReactorManager doExecute( MavenExecutionRequest request, EventDispatcher dispatcher )
throws MavenExecutionException, BuildFailureException, LifecycleExecutionException
{
- if ( request.getSettings().isOffline() )
- {
- getLogger().info( SystemWarnings.getOfflineWarning() );
-
- WagonManager wagonManager = null;
-
- try
- {
- wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
-
- wagonManager.setOnline( false );
- }
- catch ( ComponentLookupException e )
- {
- throw new MavenExecutionException( "Cannot retrieve WagonManager in order to set offline mode.", e );
- }
- finally
- {
- try
- {
- container.release( wagonManager );
- }
- catch ( ComponentLifecycleException e )
- {
- getLogger().warn( "Cannot release WagonManager.", e );
- }
- }
- }
-
try
{
resolveParameters( request.getSettings(), request.getExecutionProperties() );
@@ -663,6 +634,13 @@
{
DefaultWagonManager wagonManager = (DefaultWagonManager) container.lookup( WagonManager.ROLE );
+ if ( settings.isOffline() )
+ {
+ getLogger().info( SystemWarnings.getOfflineWarning() );
+
+ wagonManager.setOnline( false );
+ }
+
String oldUserAgent = wagonManager.getHttpUserAgent();
int firstSpace = oldUserAgent == null ? -1 : oldUserAgent.indexOf( " " );