You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2007/06/22 14:26:06 UTC
svn commit: r549796 -
/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java
Author: angela
Date: Fri Jun 22 05:26:05 2007
New Revision: 549796
URL: http://svn.apache.org/viewvc?view=rev&rev=549796
Log:
JCR-973 XML import using MacOS X WebDAV client does not work
Modified:
jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java
Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java?view=diff&rev=549796&r1=549795&r2=549796
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java Fri Jun 22 05:26:05 2007
@@ -146,7 +146,14 @@
* @see ImportContext#getContentLength()
*/
public long getContentLength() {
- return (inputCtx != null) ? inputCtx.getContentLength() : IOUtil.UNDEFINED_LENGTH;
+ if (inputCtx != null) {
+ return inputCtx.getContentLength();
+ } else if (inputFile != null) {
+ return inputFile.length();
+ } else {
+ log.debug("Unable to determine content length -> default value = " + IOUtil.UNDEFINED_LENGTH);
+ return IOUtil.UNDEFINED_LENGTH;
+ }
}
/**