From f064e78c9b34718567f4a00b152f3942f5b8708c Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Fri, 31 Aug 2018 00:25:06 +0200 Subject: [PATCH] Revert change in SchemaException handling The change switched SchemaException in connectors from FATAL to PARTIAL, but also silenced SchemaException occurring in the model. Tests like TestPreviewChanges and TestMapping then failed, as they didn't get expected SchemaException's. So reverting that change now. --- .../main/java/com/evolveum/midpoint/model/impl/util/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java index 504fa9dee8b..89152f266d1 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java @@ -674,7 +674,7 @@ public static void handleConnectorErrorCriticality(ResourceType resourceType, Th } else { ErrorSelectorType errorSelector = ResourceTypeUtil.getConnectorErrorCriticality(resourceType); if (errorSelector == null) { - if (e instanceof CommunicationException || e instanceof SchemaException) { + if (e instanceof CommunicationException) { // Just continue evaluation. The error is recorded in the result. // The consistency mechanism has (most likely) already done the best. // We cannot do any better.