if("http:/".equals(uri)) return identity;
String[] tokens = uri.substring("http://".length()).split("/");
for(String token : tokens) {
- identity = findExternalWithNameAndParent(tg, identity.resource, token);
+ identity = findExternalWithNameAndParent(tg, identity.resource, URIStringUtils.unescape(token));
if (identity == null) {
return null;
}
if(definition instanceof External) {
External def = (External)definition;
if(def.parent == -1) return "http:/";
- else return getURI(identities, def.parent) + "/" + def.name;
+ else return getURI(identities, def.parent) + "/" + URIStringUtils.escape(def.name);
} else if(definition instanceof Root) {
Root def = (Root)definition;
if(def.name.isEmpty()) return "http:/";
return def.name;
} else if (definition instanceof Internal) {
Internal def = (Internal)definition;
- return getURI(identities, def.parent) + "/" + def.name;
+ return getURI(identities, def.parent) + "/" + URIStringUtils.escape(def.name);
} else {
return "";
}