Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / cadi / client / src / main / java / org / onap / aaf / cadi / http / HSecurityInfoInit.java

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 d792be4..0da76e9 100644 (file)
--- 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
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,8 +32,8 @@ import org.onap.aaf.misc.env.APIException;
 
 /**
  * This class will pick out the best default SS for Clients per Client type
- * 
- * @author jg1555
+ *
+ * @author Instrumental
  *
  */
 public class HSecurityInfoInit implements SecurityInfoInit<HttpURLConnection> {
@@ -41,9 +41,9 @@ 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 &&
+            } else if (si.access.getProperty(Config.AAF_APPID, null)!=null &&
                       si.access.getProperty(Config.AAF_APPPASS, null)!=null) {
                 si.set(new HBasicAuthSS(si));
             }