Repository: hadoop Updated Branches: refs/heads/trunk 1aad99a71 -> 96c104d36
HDDS-766. Ozone shell create volume fails if volume name does not have a leading slash. Contributed by chencan. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/96c104d3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/96c104d3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/96c104d3 Branch: refs/heads/trunk Commit: 96c104d365bed3d7648caf2bd6cb70a7ab6f6882 Parents: 1aad99a Author: Márton Elek <[email protected]> Authored: Thu Nov 22 15:38:21 2018 +0100 Committer: kube-backup <[email protected]> Committed: Tue Nov 27 12:32:54 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java | 6 ++++++ .../org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/96c104d3/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java index 63b7576..2b54a7b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java @@ -179,6 +179,12 @@ public class OzoneAddress { // but any occurrence of them will be quoted by the URI ctor. String path = pathString.substring(start, pathString.length()); + // add leading slash to the path, if it does not exist + int firstSlash = path.indexOf('/'); + if(firstSlash != 0) { + path = "/" + path; + } + if (authority == null || authority.equals("")) { authority = EMPTY_HOST; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/96c104d3/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java index 319c4ce..600cf30 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java +++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java @@ -45,7 +45,8 @@ public class TestOzoneAddress { {"http://localhost:9878/"}, {"http://localhost/"}, {"http:///"}, - {"/"} + {"/"}, + {""} }); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
