X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdirect%2FDirectAAFLocator.java;h=98459672a1743a9834b13e47dd760b50e673cf61;hb=dbec47530c91b6cd586fb05b44fd27444301e04a;hp=cc9ee66cea3dcd709eaafffc7f543ceed18d1be9;hpb=d9c0bb04b77f6a637f1fc07b69c90898d672bd34;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java
index cc9ee66c..98459672 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java
@@ -73,9 +73,12 @@ public class DirectAAFLocator extends AbsAAFLocator<AuthzTrans> {
         }
         
         try {
-        	RegistrationPropHolder rph = new RegistrationPropHolder(access,0);
-        	String aaf_url = rph.replacements("https://"+Config.AAF_LOCATE_URL_TAG+"/%CNS."+name, null,null);
-        	//access.getProperty("/locate/"+name+':'+version;
+        	String aaf_url = access.getProperty(Config.AAF_URL, null);
+        	if(aaf_url==null) {
+        		aaf_url = "https://"+Config.AAF_LOCATE_URL_TAG+"/%NS."+name;
+        	}
+    		RegistrationPropHolder rph = new RegistrationPropHolder(access,0);
+        	aaf_url = rph.replacements(getClass().getSimpleName(),aaf_url, null,null);
         	access.printf(Level.INIT,"Creating DirectAAFLocator to %s",aaf_url);
             uri = new URI(aaf_url);
         } catch (URISyntaxException | UnknownHostException | CadiException e) {