Fix/workaround for MID-3598: After incorrect system configuration rep…

…ository objects fail to load
Evolveum · Dec 12, 2016 · a2833ff · a2833ff
1 parent 321c090
commit a2833ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
@@ -23,6 +23,7 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.*;
+import com.evolveum.midpoint.schema.internals.InternalsConfig;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 import org.apache.commons.lang.Validate;
 
@@ -349,7 +350,9 @@ public static Collection<ItemDeltaType> toItemDeltaTypes(ItemDelta delta) throws
     }
 
     public static Collection<ItemDeltaType> toItemDeltaTypes(ItemDelta delta, DeltaConversionOptions options) throws SchemaException {
-    	delta.checkConsistence();
+    	if (InternalsConfig.consistencyChecks) {
+			delta.checkConsistence();
+		}
         if (!delta.isEmpty() && delta.getPrismContext() == null) {
             throw new IllegalStateException("Non-empty ItemDelta with no prismContext cannot be converted to ItemDeltaType.");
         }

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
@@ -50,6 +50,7 @@
 import com.evolveum.midpoint.repo.cache.RepositoryCache;
 import com.evolveum.midpoint.schema.*;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
+import com.evolveum.midpoint.schema.internals.InternalsConfig;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.result.OperationResultRunner;
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
@@ -409,15 +410,14 @@ public Collection<ObjectDeltaOperation<? extends ObjectType>> executeChanges(fin
 		if (LOGGER.isTraceEnabled()) {
 			LOGGER.trace("MODEL.executeChanges(\n  deltas:\n{}\n  options:{}", DebugUtil.debugDump(deltas, 2), options);
 		}
-
-		OperationResultRunner.run(result, new Runnable() {
-			@Override
-			public void run() {
-				for(ObjectDelta<? extends ObjectType> delta: deltas) {
+
+		if (InternalsConfig.consistencyChecks) {
+			OperationResultRunner.run(result, () -> {
+				for (ObjectDelta<? extends ObjectType> delta : deltas) {
 					delta.checkConsistence();
 				}
-			}
-		});
+			});
+		}
 
 		RepositoryCache.enter();
 

diff --git a/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java b/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
@@ -569,7 +569,9 @@ private <T extends ObjectType> void validateObject(PrismObject<T> object, GetOpe
 				// Tolerate some raw meat in that case.
 				tolerateRaw = true;
 			}
-			object.checkConsistence(true, !tolerateRaw, ConsistencyCheckScope.THOROUGH);
+			if (InternalsConfig.consistencyChecks) {
+				object.checkConsistence(true, !tolerateRaw, ConsistencyCheckScope.THOROUGH);
+			}
 		} catch (RuntimeException e) {
 			result.recordFatalError(e);
 			throw e;