You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/06/25 08:24:28 UTC
[2/2] git commit: [MRM-1796] support artifacts larger than 4G
[MRM-1796] support artifacts larger than 4G
[MRM-1796] support artifacts larger than 4G
[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/48a42e89
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/48a42e89
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/48a42e89
Branch: refs/heads/master
Commit: 48a42e895ad413c5cf9e08382368d58661b20110
Parents: c648adb
Author: Brett Porter <br...@apache.org>
Authored: Wed Jun 25 14:22:18 2014 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Jun 25 16:23:53 2014 +1000
----------------------------------------------------------------------
.../java/org/apache/archiva/webdav/ArchivaDavResource.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/48a42e89/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
index c1c73ee..2257467 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
@@ -35,6 +35,7 @@ import org.apache.archiva.webdav.util.MimeTypes;
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;
@@ -211,7 +212,8 @@ public class ArchivaDavResource
{
if ( !isCollection() )
{
- outputContext.setContentLength( localResource.length() );
+ //outputContext.setContentLength( localResource.length() );
+ outputContext.setProperty( DavConstants.HEADER_CONTENT_LENGTH, Long.toString( localResource.length() ) );
outputContext.setContentType( mimeTypes.getMimeType( localResource.getName() ) );
}
@@ -329,7 +331,8 @@ 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 = 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 )