SAK-31744 fix places where MemoryService cache is improperly used, pl… (

sakaiproject#3306)

* SAK-31744 fix places where MemoryService cache is improperly used, plus a few misc cleanups

* SAK-31744: remove TODO comments

delegatedaccess/impl/src/java/org/sakaiproject/delegatedaccess/logic/ProjectLogicImpl.java

@@ -2795,13 +2795,16 @@ public Map<String, Set<String>> getHierarchySearchOptions(Map<String, String> hi
 		for(String k : orderedKeys){
 			key += k + ";" + (hierarchySearchMap.get(k) == null ? "" : hierarchySearchMap.get(k)) + ";";
 		}
+		Map<String, Set<String>> results = null;
 		if(hierarchySearchCache.containsKey(key)){
-			return (Map<String, Set<String>>) hierarchySearchCache.get(key); 
-		}else{
-			Map<String, Set<String>> results = dao.getHierarchySearchOptions(hierarchySearchMap);
-			hierarchySearchCache.put(key, results);
-			return results;
+			results = (Map<String, Set<String>>) hierarchySearchCache.get(key); 
+			if(results != null) {
+				return results;
+			}
 		}
+		results = dao.getHierarchySearchOptions(hierarchySearchMap);
+		hierarchySearchCache.put(key, results);
+		return results;
 	}
 
 	@Override

kernel/kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupService.java

@@ -3059,7 +3059,8 @@ public Set<String> getMaintainRoles(){
 
             if (maintainRolesCache != null && maintainRolesCache.containsKey("maintainRoles")) {
                 maintainRoles = (Set<String>) maintainRolesCache.get("maintainRoles");
-            } else {
+            }
+            if(maintainRoles == null) {
                 String sql = dbAuthzGroupSql.getMaintainRolesSql();
                 maintainRoles = new HashSet<String>(m_sql.dbRead(sql));
                 maintainRolesCache.put("maintainRoles", maintainRoles);

kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/SiteCacheImpl.java

@@ -111,9 +111,12 @@ public void put(String key, Object payload)
 	/**
 	 * Test for a non expired entry in the cache.
 	 * 
+	 * 2016-09-07 - Mitch Golden - The key may in fact be expired!
+	 * Be careful if you use this method
+	 *
 	 * @param key
 	 *        The cache key.
-	 * @return true if the key maps to a non-expired cache entry, false if not.
+	 * @return true if the key maps to a cache entry, false if not.
 	 */
 	@Override
     public boolean containsKey(String key)