You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ay...@apache.org on 2021/04/22 19:03:26 UTC
[ozone] branch master updated: HDDS-5124. Use
OzoneConsts.OZONE_TIME_ZONE instead of "GMT" (#2166)
This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 2c183b2 HDDS-5124. Use OzoneConsts.OZONE_TIME_ZONE instead of "GMT" (#2166)
2c183b2 is described below
commit 2c183b2e98bc8ae736a3cd96f3b785d1e42cfb9e
Author: wangzhaohui <32...@users.noreply.github.com>
AuthorDate: Fri Apr 23 03:03:05 2021 +0800
HDDS-5124. Use OzoneConsts.OZONE_TIME_ZONE instead of "GMT" (#2166)
---
.../main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 3 ++-
.../src/main/java/org/apache/hadoop/ozone/s3/util/RFC1123Util.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
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 27e0ef3..623ddad 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.ReplicationFactor;
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 @@ public class ObjectEndpoint extends EndpointBase {
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 15a09b4..ae868e5 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.DateTimeFormatterBuilder;
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 @@ public final class RFC1123Util {
.appendValue(SECOND_OF_MINUTE, 2)
.optionalEnd()
.appendLiteral(' ')
- .appendOffset("+HHMM", "GMT")
+ .appendOffset("+HHMM", OzoneConsts.OZONE_TIME_ZONE)
.toFormatter();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org