From: anushadasari <danush10@in.ibm.com>
Date: Tue, 12 Nov 2019 07:12:29 +0000 (+0530)
Subject: Merge this if statement with the enclosing one
X-Git-Tag: 2.2.0~36
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5128622fb4958005eb8eaae80990edfd4191a496;p=optf%2Fcmso.git

Merge this if statement with the enclosing one

Merging collapsible if statements increases the code's readability.

Issue-ID: OPTFRA-634
Change-Id: If8f306257cb92de244cdc929e09ba89bbda62e86
Signed-off-by: anushadasari <danush10@in.ibm.com>
---

diff --git a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java
index 0dc18db..1ce581a 100755
--- a/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java
+++ b/cmso-optimizer/src/main/java/org/onap/optf/cmso/optimizer/aaf/AafClientCache.java
@@ -138,14 +138,12 @@ public class AafClientCache {
                 cacheAge = now;
             }
             permissions = cache.get(getCacheKey(auth));
-            if (permissions == null) {
-                if (!auth.get("password").equals("")) {
+            if ((permissions == null) && (!auth.get("password").equals(""))) {
                     permissions = getPermissionsFromAaf(auth);
                     if (permissions != null) {
                         cache.put(getCacheKey(auth), permissions);
                     }
                 }
-            }
         }
         return permissions;
     }