MID-4574 backport

Evolveum · Sep 12, 2018 · d6bad11 · d6bad11
1 parent 0d0e120
commit d6bad11
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/...rovisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceCache.java b/...rovisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceCache.java
@@ -19,6 +19,8 @@
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.prism.PrismContext;
@@ -36,6 +38,8 @@
 @Component
 public class ResourceCache {
 
+	private static final Trace LOGGER = TraceManager.getTrace(ResourceCache.class);
+
 	private Map<String,PrismObject<ResourceType>> cache;
 
     ResourceCache() {
@@ -94,7 +98,14 @@ public synchronized PrismObject<ResourceType> get(String oid, String version, Ge
 		}
 
 		if (GetOperationOptions.isReadOnly(options)) {
-			cachedResource.checkImmutability();
+			try {	// MID-4574
+				cachedResource.checkImmutability();
+			} catch (IllegalStateException ex) {
+				LOGGER.error("Failed immutability test", ex);
+				cache.remove(oid);
+
+				return null;
+			}
 			return cachedResource;
 		} else {
 			return cachedResource.clone();