aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorBrett Porter <brett@apache.org>2008-04-18 06:30:31 +0000
committerBrett Porter <brett@apache.org>2008-04-18 06:30:31 +0000
commitcc0ce2d70709a09bcfafcfbc3e4460f7266d697a (patch)
tree8d918f677c20f8e36258df4e644f880f546dd79c /archiva-modules/archiva-web
parentfada72428ff488944372047ad53df0ce3ce981a4 (diff)
downloadarchiva-cc0ce2d70709a09bcfafcfbc3e4460f7266d697a.tar.gz
archiva-cc0ce2d70709a09bcfafcfbc3e4460f7266d697a.zip
[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
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java2
-rw-r--r--archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java4
2 files changed, 4 insertions, 2 deletions
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 7d2d7f40d..6a3d51576 100644
--- 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 f5016f187..82bd6e91f 100644
--- 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;