X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2Fv2_0%2FAAFCon.java;h=32a82d6dd7337a25577f37c3dacc008828c3d99b;hb=c91b63bb275b8d541309d7e1e8faa4f0bc752630;hp=b076379cf6a5609dd1fa755c7c711a493b128352;hpb=4ad4763d8c9191998cc671a884d1af5da6ba8bb9;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
index b076379c..32a82d6d 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java
@@ -166,19 +166,21 @@ public abstract class AAFCon<CLIENT> implements Connector {
 						access.printf(Access.Level.WARN,"%s, %s or %s required before use.", Config.CADI_ALIAS, Config.AAF_APPID, Config.OAUTH_CLIENT_ID);
 						set(si.defSS);
 					} else {
-						set(si.defSS=x509Alias(alias));
+						si.defSS=x509Alias(alias);
+						set(si.defSS);
 					}
 				} else {
-					if(mechid!=null && encpass !=null) {
-						set(si.defSS=basicAuth(mechid, encpass));
+					if(mechid!=null) {
+						si.defSS=basicAuth(mechid, encpass);
+						set(si.defSS);
 					} else {
-						set(si.defSS=new SecuritySetter<CLIENT>() {
-							
+						si.defSS=new SecuritySetter<CLIENT>() {
+
 							@Override
 							public String getID() {
 								return "";
 							}
-			
+
 							@Override
 							public void setSecurity(CLIENT client) throws CadiException {
 								throw new CadiException("AAFCon has not been initialized with Credentials (SecuritySetter)");
@@ -188,7 +190,8 @@ public abstract class AAFCon<CLIENT> implements Connector {
 							public int setLastResponse(int respCode) {
 								return 0;
 							}
-						});
+						};
+						set(si.defSS);
 					}
 				}
 			}
@@ -249,22 +252,21 @@ public abstract class AAFCon<CLIENT> implements Connector {
 	
 	public AAFAuthn<CLIENT> newAuthn() throws APIException {
 		try {
-			return new AAFAuthn<CLIENT>(this);
-		} catch (APIException e) {
-			throw e;
+			return new AAFAuthn<>(this);
 		} catch (Exception e) {
 			throw new APIException(e);
 		}
 	}
 
 	public AAFAuthn<CLIENT> newAuthn(AbsUserCache<AAFPermission> c) {
-		return new AAFAuthn<CLIENT>(this,c);
+		return new AAFAuthn<>(this, c);
 	}
 
 	public AAFLurPerm newLur() throws CadiException {
 		try {
 			if(lur==null) {
-				return (lur =  new AAFLurPerm(this));
+				lur = new AAFLurPerm(this);
+				return lur;
 			} else {
 				return new AAFLurPerm(this,lur);
 			}
@@ -357,13 +359,13 @@ public abstract class AAFCon<CLIENT> implements Connector {
 				Error err = errDF.newData().in(TYPE.JSON).load(f.body()).asObject();
 				return Vars.convert(err.getText(),err.getVariables());
 			} catch (APIException e){
-				// just return the body below
+				access.log(e);
 			}
 		}
 		return text;
 	}
 	
-	public static AAFCon<?> newInstance(PropAccess pa) throws APIException, CadiException, LocatorException {
+	public static AAFCon<?> newInstance(PropAccess pa) throws CadiException, LocatorException {
 		// Potentially add plugin for other kinds of Access
 		return new AAFConHttp(pa);
 	}