svn commit: r649382 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav: ArchivaDavResource.java ArchivaDavResourceFactory.java

[brett]

Author: brett
Date: Thu Apr 17 23:30:31 2008
New Revision: 649382

URL: http://svn.apache.org/viewvc?rev=649382&view=rev
Log:
[MRM-781] additional fixes to webdav
Submitted by: James William Dumay

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java?rev=649382&r1=649381&r2=649382&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java
 Thu Apr 17 23:30:31 2008
@@ -133,6 +133,8 @@
         if (!isCollection())
         {
             IOUtils.copy(new FileInputStream(localResource), 
outputContext.getOutputStream());
+            outputContext.setContentLength(getContentLength());
+            outputContext.setContentType(getContentType());
         }
         else
         {

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java?rev=649382&r1=649381&r2=649382&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
 Thu Apr 17 23:30:31 2008
@@ -269,7 +269,7 @@
         }
         catch ( RepositoryMetadataException e )
         {
-            log.error(e.getMessage(), e);
+            /* eat it */
         }
 
         try
@@ -283,7 +283,7 @@
         }
         catch ( RepositoryMetadataException e )
         {
-            log.error(e.getMessage(), e);
+            /* eat it */
         }
 
         return false;