X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2Fv2_0%2FAbsAAFLocator.java;fp=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2Fv2_0%2FAbsAAFLocator.java;h=7de8536aeed054a0356883721180899a4125f863;hb=32cdd553a8668e6d03a9cf5b11b360d35a63c87f;hp=f0909062262104244293942711659da6d6b712ea;hpb=9c8a8b0926b13b07fb1e5394903401e7a3f1ff79;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
index f0909062..7de8536a 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java
@@ -32,6 +32,7 @@ import java.util.NoSuchElementException;
 
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.aaf.Defaults;
 import org.onap.aaf.cadi.Locator;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.config.Config;
@@ -87,6 +88,12 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
 			latitude = Double.parseDouble(lat);
 			longitude = Double.parseDouble(lng);
 		}
+		if(name.startsWith(Defaults.AAF_NS)) {
+			String root_ns = access.getProperty(Config.AAF_ROOT_NS, null);
+			if(root_ns!=null) {
+				name=name.replace(Defaults.AAF_NS, root_ns);
+			}
+		}
 		if(name.startsWith("http")) { // simple URL
 			this.name = name;
 			this.version = Config.AAF_DEFAULT_VERSION;
@@ -259,7 +266,7 @@ public abstract class AbsAAFLocator<TRANS extends Trans> implements Locator<URI>
 	@Override
 	public Item best() throws LocatorException {
 		if(!hasItems()) {
-			throw new LocatorException("No Entries found" + (pathInfo==null?"":(" for " + pathInfo)));
+			throw new LocatorException("No Entries found for '" + aaf_locator_uri.toString() + "/locate/" + name + ':' + version + '\'');
 		}
 		List<EP> lep = new ArrayList<>();
 		EP first = null;