Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1796] support artifacts larger than 4G 

[MRM-1796] support artifacts larger than 4G
This commit is contained in:
Brett Porter 2014-06-25 14:22:18 +10:00 committed by Olivier Lamy
parent c648adb306
commit 48a42e895a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
View File

@ -35,6 +35,7 @@ import org.apache.archiva.webdav.util.MimeTypes;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.util.Text; import org.apache.jackrabbit.util.Text;
import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource; import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavResourceFactory; import org.apache.jackrabbit.webdav.DavResourceFactory;
@ -211,7 +212,8 @@ public class ArchivaDavResource
{ {
if ( !isCollection() ) 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() ) ); 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? // 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(); long actualContentLength = localFile.length();
// length of -1 is given for a chunked request or unknown length, in which case we accept what was uploaded // 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 ) if ( expectedContentLength >= 0 && expectedContentLength != actualContentLength )