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 (executable)
--- 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;\r
             }\r
             permissions = cache.get(getCacheKey(auth));\r
-            if (permissions == null) {\r
-                if (!auth.get("password").equals("")) {\r
-                    permissions = getPermissionsFromAaf(auth);\r
+            if ((permissions == null)&&(!auth.get("password").equals(""))) {\r
+                 permissions = getPermissionsFromAaf(auth);\r
                     if (permissions != null) {\r
                         cache.put(getCacheKey(auth), permissions);\r
                     }\r
-                }\r
             }\r
         }\r
         return permissions;\r