You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/10/10 23:35:50 UTC
svn commit: r583623 -
/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
Author: joakime
Date: Wed Oct 10 14:35:50 2007
New Revision: 583623
URL: http://svn.apache.org/viewvc?rev=583623&view=rev
Log:
Fixing XMLException on non-existant proxy metadata file.
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java?rev=583623&r1=583622&r2=583623&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/MetadataTools.java Wed Oct 10 14:35:50 2007
@@ -331,7 +331,7 @@
throws InitializationException
{
this.artifactPatterns = new ArrayList<String>();
- this.proxies = new HashMap();
+ this.proxies = new HashMap<String, Set<String>>();
initConfigVariables();
configuration.addChangeListener( this );
@@ -342,6 +342,12 @@
{
String metadataPath = getRepositorySpecificName( proxyId, toPath( reference ) );
File metadataFile = new File( managedRepository.getRepoRoot(), metadataPath );
+
+ if ( !metadataFile.exists() || !metadataFile.isFile() )
+ {
+ // Nothing to do. return null.
+ return null;
+ }
try
{
@@ -361,6 +367,12 @@
{
String metadataPath = getRepositorySpecificName( proxyId, toPath( reference ) );
File metadataFile = new File( managedRepository.getRepoRoot(), metadataPath );
+
+ if ( !metadataFile.exists() || !metadataFile.isFile() )
+ {
+ // Nothing to do. return null.
+ return null;
+ }
try
{
@@ -659,14 +671,12 @@
{
this.proxies.clear();
- List proxyConfigs = configuration.getConfiguration().getProxyConnectors();
- Iterator it = proxyConfigs.iterator();
- while ( it.hasNext() )
+ List<ProxyConnectorConfiguration> proxyConfigs = configuration.getConfiguration().getProxyConnectors();
+ for( ProxyConnectorConfiguration proxyConfig: proxyConfigs )
{
- ProxyConnectorConfiguration proxyConfig = (ProxyConnectorConfiguration) it.next();
String key = proxyConfig.getSourceRepoId();
- Set remoteRepoIds = this.proxies.get( key );
+ Set<String> remoteRepoIds = this.proxies.get( key );
if ( remoteRepoIds == null )
{