From 6d933f8b7dabfaa186fc2e090df4b04c48d3c464 Mon Sep 17 00:00:00 2001
From: Katarina Valalikova <k.valalikova@evolveum.com>
Date: Fri, 23 Feb 2018 10:57:04 +0100
Subject: [PATCH] cache registry small cleanup

---
 .../model/impl/controller/ModelController.java       | 12 +++++-------
 .../impl/controller/ModelInteractionServiceImpl.java |  5 +----
 .../evolveum/midpoint/repo/common/CacheRegistry.java |  7 +++++++
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
index 93b87b09b08..adc115be236 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
+++ b/model/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/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
index eb48187de48..bca6acbedff 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
+++ b/model/model-impl/src/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
index 62b2b9bbb95..52d9b48ee69 100644
--- 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();
+		}
+	}
 }
+