From bdbd78a4fc83e251d12d8fd462561f1f64fe9663 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Tue, 23 Oct 2007 00:51:13 +0000 Subject: [PATCH] Some error handling cleanup. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@587341 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/web/repository/ProxiedDavServer.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java index cfa63a093..7dedee43b 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java @@ -36,6 +36,7 @@ import org.apache.maven.model.DistributionManagement; import org.apache.maven.model.Model; import org.apache.maven.model.Relocation; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; import org.codehaus.plexus.webdav.AbstractDavServerComponent; import org.codehaus.plexus.webdav.DavServerComponent; import org.codehaus.plexus.webdav.DavServerException; @@ -355,6 +356,12 @@ public class ProxiedDavServer // Open and read the POM from the managed repo File pom = managedRepository.toFile( pomReference ); + + if( !pom.exists() ) + { + return; + } + try { Model model = new MavenXpp3Reader().read( new FileReader( pom ) ); @@ -384,9 +391,13 @@ public class ProxiedDavServer { // Artifact has no POM in repo : ignore } - catch ( Exception e ) + catch ( IOException e ) + { + // Unable to read POM : ignore. + } + catch ( XmlPullParserException e ) { - // invalid POM : ignore + // Invalid POM : ignore } } -- 2.39.5