Fixing merge conflicts due to HDFS-10637

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerLocationManagerImpl.java

@@ -71,7 +71,7 @@ public class ContainerLocationManagerImpl implements ContainerLocationManager {
         references = this.dataset.getFsVolumeReferences();
         for (int ndx = 0; ndx < references.size(); ndx++) {
           FsVolumeSpi vol = references.get(ndx);
-          pathList.add(Paths.get(vol.getBasePath()));
+          pathList.add(Paths.get(vol.getBaseURI().getPath()));
         }
         references.close();
         volumePaths = pathList.toArray(new Path[pathList.size()]);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OzoneContainer.java

@@ -160,7 +160,7 @@ public class OzoneContainer {
         references = dataset.getFsVolumeReferences();
         for (int ndx = 0; ndx < references.size(); ndx++) {
           FsVolumeSpi vol = references.get(ndx);
-          pathList.add(Paths.get(vol.getBasePath()));
+          pathList.add(Paths.get(vol.getBaseURI().getPath()));
         }
         references.close();
       }