You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/09/28 14:58:18 UTC
svn commit: r292169 -
/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Author: brett
Date: Wed Sep 28 05:58:13 2005
New Revision: 292169
URL: http://svn.apache.org/viewcvs?rev=292169&view=rev
Log:
don't ever ping to local repository
Modified:
maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=292169&r1=292168&r2=292169&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java Wed Sep 28 05:58:13 2005
@@ -109,14 +109,14 @@
if ( policy.isEnabled() )
{
- loadMetadata( metadata, repository, localRepository );
+ loadMetadata( metadata, repository, localRepository, true );
}
}
- loadMetadata( metadata, localRepository, localRepository );
+ loadMetadata( metadata, localRepository, localRepository, false );
}
private void loadMetadata( RepositoryMetadata repoMetadata, ArtifactRepository remoteRepository,
- ArtifactRepository localRepository )
+ ArtifactRepository localRepository, boolean setRepository )
throws ArtifactMetadataRetrievalException
{
File metadataFile = new File( localRepository.getBasedir(),
@@ -130,12 +130,19 @@
{
if ( repoMetadata.getMetadata().merge( metadata ) )
{
- repoMetadata.setRepository( remoteRepository );
+ if ( setRepository )
+ {
+ repoMetadata.setRepository( remoteRepository );
+ }
}
}
else
{
repoMetadata.setMetadata( metadata );
+ if ( setRepository )
+ {
+ repoMetadata.setRepository( remoteRepository );
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org