You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2020/08/24 11:26:12 UTC
svn commit: r1881130 - in /jackrabbit/branches/2.16: ./
jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ExportContextImpl.java
Author: reschke
Date: Mon Aug 24 11:26:12 2020
New Revision: 1881130
URL: http://svn.apache.org/viewvc?rev=1881130&view=rev
Log:
JCR-3942: Content-Length header field may be set twice (merged r1877355 into 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ExportContextImpl.java
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1877355
Modified: jackrabbit/branches/2.16/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ExportContextImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ExportContextImpl.java?rev=1881130&r1=1881129&r2=1881130&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ExportContextImpl.java (original)
+++ jackrabbit/branches/2.16/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ExportContextImpl.java Mon Aug 24 11:26:12 2020
@@ -168,13 +168,13 @@ public class ExportContextImpl extends A
if (success) {
// write properties and data to the output-context
if (outputCtx != null) {
- boolean hasContentLength = false;
- for (String name : properties.keySet()) {
- String value = properties.get(name);
+ boolean seenContentLength = false;
+ for (Map.Entry<String, String> entry : properties.entrySet()) {
+ String name = entry.getKey();
+ String value = entry.getValue();
if (name != null && value != null) {
outputCtx.setProperty(name, value);
- // check for content-length
- hasContentLength = DavConstants.HEADER_CONTENT_LENGTH.equals(name);
+ seenContentLength |= DavConstants.HEADER_CONTENT_LENGTH.equals(name);
}
}
@@ -182,7 +182,7 @@ public class ExportContextImpl extends A
OutputStream out = outputCtx.getOutputStream();
try {
// make sure the content-length is set
- if (!hasContentLength) {
+ if (!seenContentLength) {
outputCtx.setContentLength(outFile.length());
}
FileInputStream in = new FileInputStream(outFile);