Relative binding URIs not handled correctly when non-default root is specified

There is code in the BindingURIBuilder as follows....

if (baseURI == null) {
if (componentURI == null) {
if (bindingURI != null)

{ uriString = name + "/" + bindingURI.toString(); }

else

{ uriString = name; }

} else {
if (bindingURI != null) {
if (bindingURI.toString().startsWith("/"))

{ uriString = componentURI.resolve(bindingURI).toString(); }

else

{ uriString = componentURI.resolve(name + "/" + bindingURI).toString(); }

} else

{ uriString = componentURI.resolve(name).toString(); }

}
} else {
if (componentURI == null) {
if (bindingURI != null)

{ uriString = basedURI(baseURI, bindingURI).toString(); }

else

{ uriString = basedURI(baseURI, URI.create(name)).toString(); }

} else {
if (bindingURI != null)

{ uriString = basedURI(baseURI, componentURI.resolve(bindingURI)).toString(); }

else

{ uriString = basedURI(baseURI, componentURI.resolve(name)).toString(); }

}
}

Note that the branch where baseURI is non-null behaves differently w.r.t. adding name to the final URI compared to when baseURI is null.