Repository: archiva Updated Branches: refs/heads/archiva-1.3.x 11a842dc9 -> 490795668
[MRM-1796] support artifacts larger than 4G Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ba6c9b08 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ba6c9b08 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ba6c9b08 Branch: refs/heads/archiva-1.3.x Commit: ba6c9b088f8b17b648525419d1b8ada3a35c180c Parents: 11a842d Author: Brett Porter <[email protected]> Authored: Wed Jun 25 14:22:18 2014 +1000 Committer: Brett Porter <[email protected]> Committed: Wed Jun 25 14:22:18 2014 +1000 ---------------------------------------------------------------------- .../org/apache/maven/archiva/webdav/ArchivaDavResource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/ba6c9b08/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java ---------------------------------------------------------------------- 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 d08a370..f359c9c 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 @@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.util.Text; +import org.apache.jackrabbit.webdav.DavConstants; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavResource; import org.apache.jackrabbit.webdav.DavResourceFactory; @@ -199,7 +200,7 @@ public class ArchivaDavResource { if ( !isCollection() ) { - outputContext.setContentLength( localResource.length() ); + outputContext.setProperty( DavConstants.HEADER_CONTENT_LENGTH, Long.toString( localResource.length() ) ); outputContext.setContentType( mimeTypes.getMimeType( localResource.getName() ) ); } @@ -310,7 +311,7 @@ public class ArchivaDavResource } // TODO: a bad deployment shouldn't delete an existing file - do we need to write to a temporary location first? - long expectedContentLength = inputContext.getContentLength(); + long expectedContentLength = Long.parseLong( inputContext.getProperty( DavConstants.HEADER_CONTENT_LENGTH ) ); long actualContentLength = localFile.length(); // length of -1 is given for a chunked request or unknown length, in which case we accept what was uploaded if ( expectedContentLength >= 0 && expectedContentLength != actualContentLength )
