svn commit: r1021505 - /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java

[bentmann]

Author: bentmann
Date: Mon Oct 11 21:01:06 2010
New Revision: 1021505

URL: http://svn.apache.org/viewvc?rev=1021505&view=rev
Log:
o Fixed lazy repo creation to cache result repo

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=1021505&r1=1021504&r2=1021505&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
 Mon Oct 11 21:01:06 2010
@@ -1844,43 +1844,59 @@ public class MavenProject
 
     protected ArtifactRepository getReleaseArtifactRepository()
     {
-        if ( getDistributionManagement() != null && 
getDistributionManagement().getRepository() != null )
+        if ( releaseArtifactRepository == null )
         {
-            try
-            {
-                ArtifactRepository repo =
-                    repositorySystem.buildArtifactRepository( 
getDistributionManagement().getRepository() );
-                repositorySystem.injectProxy( 
projectBuilderConfiguration.getRepositorySession(), Arrays.asList( repo ) );
-                repositorySystem.injectAuthentication( 
projectBuilderConfiguration.getRepositorySession(),
-                                                       Arrays.asList( repo ) );
-                setReleaseArtifactRepository( repo );
-            }
-            catch ( InvalidRepositoryException e )
+            if ( getDistributionManagement() != null && 
getDistributionManagement().getRepository() != null )
             {
+                try
+                {
+                    ArtifactRepository repo =
+                        repositorySystem.buildArtifactRepository( 
getDistributionManagement().getRepository() );
+                    repositorySystem.injectProxy( 
projectBuilderConfiguration.getRepositorySession(),
+                                                  Arrays.asList( repo ) );
+                    repositorySystem.injectAuthentication( 
projectBuilderConfiguration.getRepositorySession(),
+                                                           Arrays.asList( repo 
) );
+                    setReleaseArtifactRepository( repo );
+                }
+                catch ( InvalidRepositoryException e )
+                {
+                    if ( logger != null )
+                    {
+                        logger.debug( "Failed to create release distribution 
repository for " + getId(), e );
+                    }
+                }
             }
         }
-        
+
         return releaseArtifactRepository;
     }
 
     protected ArtifactRepository getSnapshotArtifactRepository()
     {
-        if ( getDistributionManagement() != null && 
getDistributionManagement().getSnapshotRepository() != null )
+        if ( snapshotArtifactRepository == null )
         {
-            try
-            {
-                ArtifactRepository repo =
-                    repositorySystem.buildArtifactRepository( 
getDistributionManagement().getSnapshotRepository() );
-                repositorySystem.injectProxy( 
projectBuilderConfiguration.getRepositorySession(), Arrays.asList( repo ) );
-                repositorySystem.injectAuthentication( 
projectBuilderConfiguration.getRepositorySession(),
-                                                       Arrays.asList( repo ) );
-                setSnapshotArtifactRepository( repo );
-            }
-            catch ( InvalidRepositoryException e )
+            if ( getDistributionManagement() != null && 
getDistributionManagement().getSnapshotRepository() != null )
             {
+                try
+                {
+                    ArtifactRepository repo =
+                        repositorySystem.buildArtifactRepository( 
getDistributionManagement().getSnapshotRepository() );
+                    repositorySystem.injectProxy( 
projectBuilderConfiguration.getRepositorySession(),
+                                                  Arrays.asList( repo ) );
+                    repositorySystem.injectAuthentication( 
projectBuilderConfiguration.getRepositorySession(),
+                                                           Arrays.asList( repo 
) );
+                    setSnapshotArtifactRepository( repo );
+                }
+                catch ( InvalidRepositoryException e )
+                {
+                    if ( logger != null )
+                    {
+                        logger.debug( "Failed to create snapshot distribution 
repository for " + getId(), e );
+                    }
+                }
             }
         }
-        
+
         return snapshotArtifactRepository;
     }