[MRM-781] additional fixes to webdav

Submitted by: James William Dumay

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@649382 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
index 7d2d7f40dbeea72ed894748903640885c8f81239..6a3d5157642f58fd335ed85ac7fc3f9307d348c6 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
@@ -133,6 +133,8 @@ public class ArchivaDavResource implements DavResource
         if (!isCollection())
         {
             IOUtils.copy(new FileInputStream(localResource), outputContext.getOutputStream());
+            outputContext.setContentLength(getContentLength());
+            outputContext.setContentType(getContentType());
         }
         else
         {

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
index f5016f1871d0c629dad3f23b716347fa1b1295fe..82bd6e91fe8444dd2d08e0fc3598434d23f8f79d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
@@ -269,7 +269,7 @@ public class ArchivaDavResourceFactory implements DavResourceFactory, Auditable
         }
         catch ( RepositoryMetadataException e )
         {
-            log.error(e.getMessage(), e);
+            /* eat it */
         }
 
         try
@@ -283,7 +283,7 @@ public class ArchivaDavResourceFactory implements DavResourceFactory, Auditable
         }
         catch ( RepositoryMetadataException e )
         {
-            log.error(e.getMessage(), e);
+            /* eat it */
         }
 
         return false;