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 27e0ef37c694..623ddad51a4d 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 @@ -55,6 +55,7 @@ import org.apache.hadoop.hdds.client.ReplicationType; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.conf.StorageUnit; +import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneKeyDetails; import org.apache.hadoop.ozone.client.OzoneMultipartUploadPartListParts; @@ -339,7 +340,7 @@ private void addLastModifiedDate( ResponseBuilder responseBuilder, OzoneKeyDetails key) { ZonedDateTime lastModificationTime = key.getModificationTime() - .atZone(ZoneId.of("GMT")); + .atZone(ZoneId.of(OzoneConsts.OZONE_TIME_ZONE)); responseBuilder .header(LAST_MODIFIED, diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RFC1123Util.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RFC1123Util.java index 15a09b4bcefb..ae868e51f367 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RFC1123Util.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RFC1123Util.java @@ -23,6 +23,7 @@ import java.time.format.SignStyle; import java.util.HashMap; import java.util.Map; +import org.apache.hadoop.ozone.OzoneConsts; import static java.time.temporal.ChronoField.DAY_OF_MONTH; import static java.time.temporal.ChronoField.DAY_OF_WEEK; @@ -92,7 +93,7 @@ private RFC1123Util() { .appendValue(SECOND_OF_MINUTE, 2) .optionalEnd() .appendLiteral(' ') - .appendOffset("+HHMM", "GMT") + .appendOffset("+HHMM", OzoneConsts.OZONE_TIME_ZONE) .toFormatter(); } }