AAF Services non root, all platforms

[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 f6808a9..db606a5 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
@@ -190,11 +190,16 @@ public class Agent {
                 }
 
                 if(access==null) {
+                       boolean createOutsideForLoop = false;
                     for(Entry<Object, Object> es : System.getProperties().entrySet()) {
                         if(Config.CADI_PROP_FILES.equals(es.getKey())) {
-                            access = new PropAccess();
+                            createOutsideForLoop = true;
+                            break;
                         }
                     }
+                    if(createOutsideForLoop) {
+                       access = new PropAccess();
+                    }
                 }
 
                 // When using Config file, check if Cred Exists, and if not, work with Deployer.
@@ -762,7 +767,12 @@ public class Agent {
             machine = fqdns[1];
         } else {
             key = machine;
-            fqdns = machines(cmds);
+            if(cmds.size()>0) {
+               fqdns = machines(cmds);
+            } else {
+               // make sure machine is also in SANS
+               fqdns = new String[] {machine};
+            }
         }
 
         TimeTaken tt = transitiveInfo.start("Place Artifact", Env.REMOTE);