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

revert previous commit as 2.x was not affected in fact

This commit is contained in:
Olivier Lamy 2014-06-25 16:27:46 +10:00
parent 48a42e895a
commit 7cc7854a26
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,8 +212,7 @@ 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() ) );
} }
@ -331,8 +330,7 @@ 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 )