Agent correctly sort Cert Chain/Truststore

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / server / AbsService.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
index 9ece484..5fbb951 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsService.java
@@ -62,10 +62,10 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
         this.access = access;
         this.env = env;
 
-        String str = access.getProperty(Config.AAF_LOCATOR_NAMES, null);
+        String str = access.getProperty(Config.AAF_LOCATOR_ENTRIES, null);
         String[] scomp = Split.splitTrim(',', str);
         if(scomp.length==0) {
-               throw new CadiException(Config.AAF_LOCATOR_NAMES + " must be defined.");
+               throw new CadiException(Config.AAF_LOCATOR_ENTRIES + " must be defined.");
         } else {
                str = ROOT_NS + '.' + scomp[0];
         }
@@ -76,7 +76,7 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
                str = Defaults.AAF_VERSION;
                env.setProperty(Config.AAF_LOCATOR_VERSION, str);
         }
-        app_version = str;
+        app_version = access.getProperty(Config.AAF_DEPLOYED_VERSION, str);
         
         // Print Cipher Suites Available
         if (access.willLog(Level.DEBUG)) {
@@ -187,5 +187,4 @@ public abstract class AbsService<ENV extends BasicEnv, TRANS extends Trans> exte
         }
         return def;
     }
-
 }