Send a 404 error when an artifact isn't found in a repository.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-0.9@536879 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
index 334be6873e1ff4f05d1223c5872483a7f67429f7..6eabe03470d22cebc8e3c9ae22dc7d1f193a04ad 100644 (file)
--- a/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
+++ b/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
@@ -140,7 +140,14 @@ public class ProxiedDavServer
         {
             if ( !hasResource( request.getLogicalResource() ) )
             {
-                fetchContentFromProxies( request );
+                try
+                {
+                    fetchContentFromProxies( request );
+                }
+                catch ( ResourceDoesNotExistException e )
+                {
+                    response.sendError(404);
+                }
             }
         }
 
@@ -148,19 +155,13 @@ public class ProxiedDavServer
     }
 
     private void fetchContentFromProxies( DavServerRequest request )
-        throws ServletException
+        throws ServletException, ResourceDoesNotExistException
     {
         try
         {
             proxyRequestHandler.get( request.getLogicalResource(), this.proxiedRepositories, this.managedRepository,
                                      this.wagonProxy );
         }
-        catch ( ResourceDoesNotExistException e )
-        {
-            // TODO: getLogger().info( "Unable to fetch resource, it does not exist.", e );
-            // return an HTTP 404 instead of HTTP 500 error.
-            return;
-        }
         catch ( ProxyException e )
         {
             throw new ServletException( "Unable to fetch resource.", e );