You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ah...@apache.org on 2007/05/10 16:56:20 UTC

svn commit: r536879 - /maven/archiva/branches/archiva-0.9/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java

Author: aheritier
Date: Thu May 10 07:56:18 2007
New Revision: 536879

URL: http://svn.apache.org/viewvc?view=rev&rev=536879
Log:
Send a 404 error when an artifact isn't found in a repository.

Modified:
    maven/archiva/branches/archiva-0.9/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java

Modified: maven/archiva/branches/archiva-0.9/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-0.9/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java?view=diff&rev=536879&r1=536878&r2=536879
==============================================================================
--- maven/archiva/branches/archiva-0.9/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java (original)
+++ maven/archiva/branches/archiva-0.9/archiva-webapp/src/main/java/org/apache/maven/archiva/web/repository/ProxiedDavServer.java Thu May 10 07:56:18 2007
@@ -140,7 +140,14 @@
         {
             if ( !hasResource( request.getLogicalResource() ) )
             {
-                fetchContentFromProxies( request );
+                try
+                {
+                    fetchContentFromProxies( request );
+                }
+                catch ( ResourceDoesNotExistException e )
+                {
+                    response.sendError(404);
+                }
             }
         }
 
@@ -148,18 +155,12 @@
     }
 
     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 )
         {