X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fcore%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfig%2FRegistrationPropHolder.java;h=aa78231305900328125d5a811c08743fa2deee2e;hb=bf3d3075cac610b901c951ae135fcdbcc6ffecb8;hp=b6cd533cb79b4f1592cafbe56f01236e2ad8501a;hpb=a6be2293d445881c447b7f8534e382f0d767a3bc;p=aaf%2Fauthz.git

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java
index b6cd533c..aa782313 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java
@@ -170,27 +170,6 @@ public class RegistrationPropHolder {
 			}
 		}
 
-		if(source.indexOf("%NS")>=0) {
-			str = getNS(dot_le);
-			if(str==null || str.isEmpty()) {
-				source = source.replace("%NS"+'.', str);
-			}
-			source = source.replace("%NS", str);
-		}
-
-		// aaf_root_ns
-		if(source.indexOf("AAF_NS")>=0) {
-			str = access.getProperty(Config.AAF_ROOT_NS, null);
-			if(str!=null) {
-				String temp = source.replace("%AAF_NS", str);
-				if(temp == source) { // intended
-					source = source.replace("AAF_NS", str); // Backward Compatibility
-				} else {
-					source = temp;
-				}
-			}
-		}
-
 		int atC = source.indexOf("%C"); 
 		if(atC>=0) {
 			// aaf_locator_container_ns
@@ -207,11 +186,37 @@ public class RegistrationPropHolder {
 			source = source.replace("%C", str);
 		}
 		
+		if(source.indexOf("%NS")>=0) {
+			str = getNS(dot_le);
+			if(str==null || str.isEmpty()) {
+				source = source.replace("%NS"+'.', str);
+			}
+			source = source.replace("%NS", str);
+		}
+
+		// aaf_root_ns
+		if(source.indexOf("AAF_NS")>=0) {
+			str = access.getProperty(Config.AAF_ROOT_NS, Config.AAF_ROOT_NS_DEF);
+			String temp = source.replace("%AAF_NS", str);
+			if(temp.equals(source)) { // intended
+				source = source.replace("AAF_NS", str); // Backward Compatibility
+			} else {
+				source = temp;
+			}
+		}
+
+		
 		if(source.indexOf('%')>=0) {
-			// These shouldn't be expected to have dot elements
-			source = source.replace("%N", name);
-			source = source.replace("%DF", default_fqdn);
-			source = source.replace("%PH", public_hostname);
+            // These shouldn't be expected to have dot elements
+            if(name!=null) {
+              source = source.replace("%N", name);
+            }
+            if(default_fqdn!=null) {
+              source = source.replace("%DF", default_fqdn);
+            }
+            if(public_hostname!=null) {
+              source = source.replace("%PH", public_hostname);
+            }
 		}
 		return source;
 	}