cache registry small cleanup

Evolveum · Feb 23, 2018 · 6d933f8 · 6d933f8
1 parent a2769f7
commit 6d933f8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
@@ -406,13 +406,6 @@ public Collection<ObjectDeltaOperation<? extends ObjectType>> executeChanges(fin
 							}
 						}
 
-						if (delta.getObjectTypeClass() == FunctionLibraryType.class) {
-							List<Cacheable> cacheableServices = cacheRegistry.getCacheableServices();
-							for (Cacheable cacheableService : cacheableServices) {
-								cacheableService.clearCache();
-							}
-						}
-
 						final boolean preAuthorized = ModelExecuteOptions.isPreAuthorized(options);
 						PrismObject objectToDetermineDetailsForAudit = null;
 						try {
@@ -620,6 +613,11 @@ private void invalidateCaches(Collection<ObjectDeltaOperation<? extends ObjectTy
 					systemObjectCache.invalidateCaches();
 				}
 			}
+
+			if (objectDelta.getObjectTypeClass() == FunctionLibraryType.class) {
+				cacheRegistry.clearAllCaches();
+			}
+
 		}
 	}
 

diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
@@ -1644,10 +1644,7 @@ public ExecuteCredentialResetResponseType executeCredentialsReset(PrismObject<Us
 	}
 
 	public void clearCaches() {
-		List<Cacheable> cacheableServices = cacheRegistry.getCacheableServices();
-		for (Cacheable cacheable: cacheableServices) {
-			cacheable.clearCache();
-		}
+		cacheRegistry.clearAllCaches();
 	}
 
 

diff --git a/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/CacheRegistry.java b/repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/CacheRegistry.java
@@ -32,4 +32,11 @@ public void registerCacheableService(Cacheable cacheableService) {
 	public List<Cacheable> getCacheableServices() {
 		return cacheableServices;
 	}
+
+	public void clearAllCaches() {
+		for (Cacheable cacheableService : cacheableServices) {
+			cacheableService.clearCache();
+		}
+	}
 }
+