Repository: hadoop Updated Branches: refs/heads/trunk 9146d33e1 -> 3ed716330
HDDS-678. Format of Last-Modified header is invalid in HEAD Object call. Contributed by Elek Marton. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3ed71633 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ed71633 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ed71633 Branch: refs/heads/trunk Commit: 3ed71633029e1d2d85b97e77b54e95d474066b4f Parents: 9146d33 Author: Bharat Viswanadham <bha...@apache.org> Authored: Wed Oct 17 20:44:41 2018 -0700 Committer: Bharat Viswanadham <bha...@apache.org> Committed: Wed Oct 17 20:44:52 2018 -0700 ---------------------------------------------------------------------- .../apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 11 ++++++++++- .../apache/hadoop/ozone/s3/endpoint/TestObjectHead.java | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ed71633/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java index d32bc9f..15ad2c4 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java @@ -34,6 +34,10 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.StreamingOutput; import java.io.IOException; import java.io.InputStream; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -180,8 +184,13 @@ public class ObjectEndpoint extends EndpointBase { } } + ZonedDateTime lastModificationTime = + Instant.ofEpochMilli(key.getModificationTime()) + .atZone(ZoneId.of("GMT")); + return Response.ok().status(HttpStatus.SC_OK) - .header("Last-Modified", key.getModificationTime()) + .header("Last-Modified", + DateTimeFormatter.RFC_1123_DATE_TIME.format(lastModificationTime)) .header("ETag", "" + key.getModificationTime()) .header("Content-Length", key.getDataSize()) .header("Content-Type", "binary/octet-stream") http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ed71633/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java index 446c2c9..6c166d7 100644 --- a/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java +++ b/hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/endpoint/TestObjectHead.java @@ -21,6 +21,7 @@ package org.apache.hadoop.ozone.s3.endpoint; import javax.ws.rs.core.Response; import java.io.IOException; +import java.time.format.DateTimeFormatter; import org.apache.hadoop.hdds.client.ReplicationFactor; import org.apache.hadoop.hdds.client.ReplicationType; @@ -80,6 +81,10 @@ public class TestObjectHead { Assert.assertEquals(200, response.getStatus()); Assert.assertEquals(value.getBytes().length, Long.parseLong(response.getHeaderString("Content-Length"))); + + DateTimeFormatter.RFC_1123_DATE_TIME + .parse(response.getHeaderString("Last-Modified")); + } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
