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/07/09 19:23:44 UTC
svn commit: r1879725 - in /jackrabbit/branches/2.20: ./
jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DirListingExportHandler.java
jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ConditionalsTest.java
Author: reschke
Date: Thu Jul 9 19:23:44 2020
New Revision: 1879725
URL: http://svn.apache.org/viewvc?rev=1879725&view=rev
Log:
JCR-4590: jcr-server: DirListingExportHandler sets empty Etag (merged r1879159 into 2.20)
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DirListingExportHandler.java
jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ConditionalsTest.java
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1879159
Modified: jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DirListingExportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DirListingExportHandler.java?rev=1879725&r1=1879724&r2=1879725&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DirListingExportHandler.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DirListingExportHandler.java Thu Jul 9 19:23:44 2020
@@ -135,7 +135,6 @@ public class DirListingExportHandler imp
// properties (content length undefined)
context.setModificationTime(new Date().getTime());
context.setContentType("text/html", "UTF-8");
- context.setETag("");
// data
if (context.hasStream()) {
@@ -199,7 +198,6 @@ public class DirListingExportHandler imp
// properties (content length undefined)
context.setModificationTime(new Date().getTime());
context.setContentType("text/html", "UTF-8");
- context.setETag("");
// data
if (context.hasStream()) {
Modified: jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ConditionalsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ConditionalsTest.java?rev=1879725&r1=1879724&r2=1879725&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ConditionalsTest.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/ConditionalsTest.java Thu Jul 9 19:23:44 2020
@@ -162,4 +162,16 @@ public class ConditionalsTest extends We
delete(testUri);
}
}
+
+ public void testGetCollectionEtag() throws IOException, ParseException {
+ String testUri = this.uri.toString() + (this.uri.toString().endsWith("/") ? "" : "/");
+ HttpGet get = new HttpGet(testUri);
+ HttpResponse response = this.client.execute(get, this.context);
+ int status = response.getStatusLine().getStatusCode();
+ assertEquals(200, status);
+ Header etag = response.getFirstHeader("etag");
+ if (etag != null) {
+ assertFalse("etag must not be empty", "".equals(etag.getValue()));
+ }
+ }
}