The old implementation will NOT strip the filename part from the baseUrl, e.g. https://android.googlesource.com/platform/manifest with .. will be resolved to https://android.googlesource.com/platform/, which is actually wrong. This implementation will resolve it to https://android.googlesource.com/ to match the behavior of repo. Change-Id: Ia32c8b34e16eacdf37a0da7025bf0b5cc5f67ed2 Signed-off-by: Yuxuan 'fishy' Wang <fishywang@google.com>tags/v3.5.0.201409071800-rc1
} | } | ||||
final String remoteUrl; | final String remoteUrl; | ||||
try { | try { | ||||
URI uri = new URI(String.format("%s/%s/", baseUrl, remotes.get(defaultRemote))); //$NON-NLS-1$ | |||||
remoteUrl = uri.normalize().toString(); | |||||
URI uri = new URI(baseUrl); | |||||
remoteUrl = uri.resolve(remotes.get(defaultRemote)).toString(); | |||||
} catch (URISyntaxException e) { | } catch (URISyntaxException e) { | ||||
throw new SAXException(e); | throw new SAXException(e); | ||||
} | } |