svn commit: r773075 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant: AbstractArtifactTask.java Pom.java

[pgier]

Author: pgier
Date: Fri May  8 20:16:17 2009
New Revision: 773075

URL: http://svn.apache.org/viewvc?rev=773075&view=rev
Log:
Make sure that profileManager is always initialized before it is used.

Modified:
    
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
    
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java

Modified: 
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=773075&r1=773074&r2=773075&view=diff
==============================================================================
--- 
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
 (original)
+++ 
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
 Fri May  8 20:16:17 2009
@@ -284,8 +284,6 @@
             settings.setLocalRepository( location );
         }
 
-        profileManager = new DefaultProfileManager( getContainer(), 
getSettings(), System.getProperties() );
-
         WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
         wagonManager.setDownloadMonitor( new AntDownloadMonitor() );
         if ( settings.isOffline() )
@@ -636,6 +634,10 @@
 
     protected ProfileManager getProfileManager()
     {
+        if ( profileManager == null )
+        {
+            profileManager = new DefaultProfileManager( getContainer(), 
getSettings(), System.getProperties() );
+        }
         return profileManager;
     }
 

Modified: 
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java
URL: 
http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java?rev=773075&r1=773074&r2=773075&view=diff
==============================================================================
--- 
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java
 (original)
+++ 
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/Pom.java
 Fri May  8 20:16:17 2009
@@ -401,11 +401,6 @@
      */
     private void addAntRepositoriesToProfileManager()
     {
-        if ( this.getProfileManager() == null )
-        {
-            return;
-        }
-
         List remoteRepositories = this.getRemoteRepositories();
 
         if ( remoteRepositories == null || remoteRepositories.isEmpty() )
@@ -424,10 +419,9 @@
             mavenRepo.setUrl( antRepo.getUrl() );
             repositoriesProfile.addRepository( mavenRepo );
         }
-        ProfileManager profMan = this.getProfileManager();
-        profMan.addProfile( repositoriesProfile );
-        profMan.explicitlyActivate( repositoriesProfile.getId() );
 
+        getProfileManager().addProfile( repositoriesProfile );
+        getProfileManager().explicitlyActivate( repositoriesProfile.getId() );
     }
     
     private ProfileManager getActivatedProfiles()