diff options
| author |   Gathman, Jonathan (jg1555) <jg1555@us.att.com> | 2019-07-08 17:57:32 -0500 |
|---|---|---|
| committer |   Instrumental <jonathan.gathman@att.com> | 2019-07-08 18:10:56 -0500 |
| commit | d0d6604a0371457d84eceb56d9fff668e865253f (patch) | |
| tree | 2cbf621ecb07e653006d50a1ffd1e5fe9d2310f9 /cadi/core | |
| parent | e1293ae0c53791a2189e372048e4dd4023a4b0f3 (diff) | |
Cred delete fixes
Issue-ID: AAF-857
Change-Id: I5e590eec0e18a17bb9f89d7f704c86fca3f377de
Signed-off-by: Gathman, Jonathan (jg1555) <jg1555@us.att.com>
Diffstat (limited to 'cadi/core')
| -rw-r--r-- | cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java | 9 | ||||
| -rw-r--r-- | cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_GetAccess.java | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java index fac6a3f1..994e3250 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java @@ -108,7 +108,6 @@ public class PropAccess implements Access { protected synchronized void init(Properties p) { // Make sure these two are set before any changes in Logging name = "cadi"; - level=DEFAULT.maskOf(); props = new Properties(); // First, load related System Properties @@ -127,16 +126,14 @@ public class PropAccess implements Access { // Preset LogLevel String sLevel = props.getProperty(Config.CADI_LOGLEVEL); - if (sLevel!=null) { - level=Level.valueOf(sLevel).maskOf(); - } - // Third, load any Chained Property Files load(props.getProperty(Config.CADI_PROP_FILES)); if(sLevel==null) { // if LogLev wasn't set before, check again after Chained Load sLevel = props.getProperty(Config.CADI_LOGLEVEL); - if (sLevel!=null) { + if (sLevel==null) { + level=DEFAULT.maskOf(); + } else { level=Level.valueOf(sLevel).maskOf(); } } diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_GetAccess.java b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_GetAccess.java index c87b9c32..8333db53 100644 --- a/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_GetAccess.java +++ b/cadi/core/src/test/java/org/onap/aaf/cadi/config/test/JU_GetAccess.java @@ -73,7 +73,7 @@ public class JU_GetAccess { @SuppressWarnings("unused") GetAccess getAccess = new GetAccess(accessGet); String[] lines = outStream.toString().split(System.lineSeparator()); - assertThat(lines.length, is(6)); + assertThat(lines.length, is(5)); output = lines[0].split(" ", 2)[1]; } |