From: Thugutla sailakshmi <tsaila10@in.ibm.com>
Date: Wed, 6 Nov 2019 08:04:38 +0000 (+0530)
Subject: AafClientCache.java-merge if with existing one
X-Git-Tag: 2.2.0~41^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=01e22f0171485e40f48ad4dd8090117eaf134163;p=optf%2Fcmso.git

AafClientCache.java-merge if with existing one

Issue-ID: AAF-876
Change-Id: I65ff5fabfc71c4df1628611f44ed5084993e4fe4
Signed-off-by: Thugutla sailakshmi <tsaila10@in.ibm.com>
---

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