From a174f8ddbc5eb78a648fb68b33ef18cb64d81fda Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Thu, 7 Mar 2019 12:58:39 -0600
Subject: Improve Batches

Issue-ID: AAF-740
Change-Id: Ib3e8a3f977964eed2e992dc02154dd3bc90492df
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java        | 5 ++---
 .../src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'cadi/client/src/main/java/org')

diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
index daca47df..056651eb 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HClient.java
@@ -40,7 +40,6 @@ import org.onap.aaf.cadi.SecuritySetter;
 import org.onap.aaf.cadi.client.EClient;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
-import org.onap.aaf.cadi.util.FixURIinfo;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Data;
 import org.onap.aaf.misc.env.Data.TYPE;
@@ -153,9 +152,9 @@ public class HClient implements EClient<HttpURLConnection> {
         	throw e;
         } catch (Exception e) {
         	if(sendURI==null) {
-        		throw new APIException("Cannot connect to Root URI: " + uri.toString(),e);
+        		throw new APIException("Cannot connect to Root URI: '" + uri.toString() + '\'',e);
         	} else {
-        		throw new APIException("Cannot connect to " + sendURI.toString() + "(Root URI: " + uri.toString() +')',e);
+        		throw new APIException("Cannot connect to '" + sendURI.toString() + "' (Root URI: '" + uri.toString() + "')",e);
         	}
         } finally { // ensure all these are reset after sends
             meth=pathinfo=null;
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java
index 68d0f209..7c7d391f 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java
+++ b/cadi/client/src/main/java/org/onap/aaf/cadi/http/HSecurityInfoInit.java
@@ -41,7 +41,7 @@ public class HSecurityInfoInit implements SecurityInfoInit<HttpURLConnection> {
     @Override
     public SecuritySetter<HttpURLConnection> bestDefault(SecurityInfoC<HttpURLConnection> si) throws CadiException {
         try {
-            if (si.defaultAlias!=null) {
+            if (si.defaultClientAlias!=null) {
                 si.set(new HX509SS(si));
             } else if (si.access.getProperty(Config.AAF_APPID, null)!=null &&
                       si.access.getProperty(Config.AAF_APPPASS, null)!=null) {
-- 
cgit