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

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 7f1b0cf6..b3de9754 100644
--- 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
@@ -52,6 +52,7 @@ import org.onap.aaf.cadi.CmdLine;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.aaf.Defaults;
 import org.onap.aaf.cadi.aaf.client.ErrMessage;
 import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
 import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
@@ -126,7 +127,7 @@ public class Agent {
 				AAFSSO aafsso=null;
 				PropAccess access;
 				
-				if(args.length>0 && args[0].equals("validate")) {
+				if(args.length>1 && args[0].equals("validate")) {
 					int idx = args[1].indexOf('=');
 					aafsso = null;
 					access = new PropAccess(
@@ -353,8 +354,8 @@ public class Agent {
 	}
 
 	private static void createArtifact(Trans trans, AAFCon<?> aafcon, Deque<String> cmds) throws Exception {
-		String mechID = fqi(cmds);
-		String machine = machine(cmds);
+		final String mechID = fqi(cmds);
+		final String machine = machine(cmds);
 
 		Artifacts artifacts = new Artifacts();
 		Artifact arti = new Artifact();
@@ -798,6 +799,7 @@ public class Agent {
 					directedPut(pa, filesymm, normal,creds, Config.CADI_KEYFILE, fkf.getCanonicalPath());
 					directedPut(pa, filesymm, normal,creds, Config.AAF_APPID,fqi);
 					directedPut(pa, filesymm, normal,creds, Config.AAF_APPPASS,null);
+					directedPut(pa, filesymm, normal,creds, Config.AAF_URL, Defaults.AAF_URL);
 					
 
 					String cts = pa.getProperty(Config.CADI_TRUSTSTORE);
@@ -928,7 +930,7 @@ public class Agent {
 			if(tag.endsWith("_password")) {
 				if(val.length()>4) {
 					if(val.startsWith("enc:")) {
-						val = orig.decrypt(value, true);
+						val = orig.decrypt(val, true);
 					}
 					val = "enc:" + symm.enpass(val);
 				}