Repository: hadoop Updated Branches: refs/heads/ozone-0.3 c0a43ac91 -> 8411c2bf5
HDDS-777. Fix missing jenkins issue in s3gateway module. Contributed by Bharat Viswanadham. (cherry picked from commit c5eb237e3e951e27565d40a47b6f55e7eb399f5c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8411c2bf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8411c2bf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8411c2bf Branch: refs/heads/ozone-0.3 Commit: 8411c2bf5626296a40f2bda9217ffaabe7ce91f5 Parents: c0a43ac Author: Bharat Viswanadham <bha...@apache.org> Authored: Wed Oct 31 19:11:12 2018 -0700 Committer: Bharat Viswanadham <bha...@apache.org> Committed: Wed Oct 31 19:11:47 2018 -0700 ---------------------------------------------------------------------- hadoop-ozone/s3gateway/pom.xml | 2 +- .../apache/hadoop/ozone/s3/util/S3Consts.java | 18 ++++++++++++++++++ .../apache/hadoop/ozone/s3/util/S3utils.java | 20 +++++++++++++++++++- 3 files changed, 38 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8411c2bf/hadoop-ozone/s3gateway/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml index 38ffa41..23d41f4 100644 --- a/hadoop-ozone/s3gateway/pom.xml +++ b/hadoop-ozone/s3gateway/pom.xml @@ -22,7 +22,7 @@ <version>0.3.0-SNAPSHOT</version> </parent> <artifactId>hadoop-ozone-s3gateway</artifactId> - <name>Apache Hadoop Ozone S3 Gatway</name> + <name>Apache Hadoop Ozone S3 Gateway</name> <packaging>jar</packaging> <version>0.3.0-SNAPSHOT</version> <properties> http://git-wip-us.apache.org/repos/asf/hadoop/blob/8411c2bf/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java index 70d8a96..6ece7df 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3Consts.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.hadoop.ozone.s3.util; import org.apache.hadoop.classification.InterfaceAudience; http://git-wip-us.apache.org/repos/asf/hadoop/blob/8411c2bf/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3utils.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3utils.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3utils.java index 8af0927..652ba7f 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3utils.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/S3utils.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ package org.apache.hadoop.ozone.s3.util; import org.apache.commons.codec.DecoderException; @@ -52,7 +70,7 @@ public final class S3utils { byte[] actualKeyBytes = Hex.decodeHex(hex); String digestActualKey = DigestUtils.sha256Hex(actualKeyBytes); if (digest.equals(digestActualKey)) { - return new String(actualKeyBytes); + return new String(actualKeyBytes, StandardCharsets.UTF_8); } else { OS3Exception ex = S3ErrorTable.newError(S3ErrorTable .INVALID_ARGUMENT, key); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
