Merge "Sonar Fox: InputIterator.java"

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / configure / Agent.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
index 18430ef..c7a7496 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
@@ -229,7 +229,7 @@ public class Agent {
                             aafsso.setStdErrDefault();
                             
                             // if CM_URL can be obtained, add to sso.props, if written
-                            String cm_url = getProperty(access,env,false, Config.CM_URL,Config.CM_URL+": ");
+                            String cm_url = getProperty(access,env,false, Config.CM_URL,Config.CM_URL_DEF);
                             if (cm_url!=null) {
                                 aafsso.addProp(Config.CM_URL, cm_url);
                             }
@@ -773,8 +773,15 @@ public class Agent {
             }
             
             app.add(Config.AAF_LOCATE_URL, propAccess, null);
+            for(Entry<Object, Object> aaf_loc_prop : propAccess.getProperties().entrySet()) {
+               String key = aaf_loc_prop.getKey().toString();
+               if(key.startsWith("aaf_locator")) {
+                       app.add(key, aaf_loc_prop.getValue().toString());
+               }
+            }
+            
             app.add(Config.AAF_APPID, fqi);
-            app.add(Config.AAF_URL, propAccess, Defaults.AAF_URL);
+            app.add(Config.AAF_URL, propAccess, Config.AAF_URL_DEF);
 
             String cts = propAccess.getProperty(Config.CADI_TRUSTSTORE);
             if (cts!=null) {