[RM-7162] Changed isCached flag logic. Code formatting.

(cherry picked from commit e385b5ae17)
This commit is contained in:
tiagos
2020-10-20 22:00:05 +01:00
parent b7a62c8bff
commit 1f348ca599

View File

@@ -76,15 +76,12 @@ public class RMContainerCacheManager implements RecordsManagementModel
*/ */
public boolean isCached(StoreRef storeRef) public boolean isCached(StoreRef storeRef)
{ {
boolean isCached = true;
Pair<StoreRef, String> key = getKey(storeRef); Pair<StoreRef, String> key = getKey(storeRef);
Set<NodeRef> values = cache.get(key); Set<NodeRef> values = cache.get(key);
if (values == null || values.size() == 0) boolean isCached = (values != null && !values.isEmpty());
if (!isCached)
{ {
if (values != null) { cache.remove(key);
cache.remove(key);
}
isCached = false;
} }
return isCached; return isCached;
} }
@@ -128,7 +125,7 @@ public class RMContainerCacheManager implements RecordsManagementModel
if (entries.size() > 0) if (entries.size() > 0)
{ {
cache.put(key, entries); cache.put(key, entries);
} }
} }
} }
@@ -148,7 +145,8 @@ public class RMContainerCacheManager implements RecordsManagementModel
if (cache.contains(key)) if (cache.contains(key))
{ {
cache.get(key).remove(nodeRef); cache.get(key).remove(nodeRef);
if (cache.get(key).size() == 0) { if (cache.get(key).size() == 0)
{
cache.remove(key); cache.remove(key);
} }
} }