Fix a NPE and result handling

Related to MID-6228.
Evolveum · Sep 25, 2020 · a48ee58 · a48ee58
1 parent 34d658a
commit a48ee58
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 33 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
@@ -183,7 +183,9 @@ public static ResourceShadowDiscriminator fromResourceShadowDiscriminatorType(
                 kind, intent, bean.getTag(),
                 BooleanUtils.isTrue(bean.isTombstone()));
         rsd.setObjectClass(bean.getObjectClassName());
-        rsd.setOrder(bean.getDiscriminatorOrder());
+        if (bean.getDiscriminatorOrder() != null) {
+            rsd.setOrder(bean.getDiscriminatorOrder());
+        }
         return rsd;
     }
 

diff --git a/...n/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java b/...n/src/main/java/com/evolveum/midpoint/model/common/stringpolicy/ValuePolicyProcessor.java
@@ -178,47 +178,53 @@ public boolean validateValue(String newValue, ValuePolicyType pp,
 
         OperationResult result = parentResult.createSubresult(OPERATION_STRING_POLICY_VALIDATION);
         result.addArbitraryObjectAsParam("policyName", pp.getName());
-        normalize(pp);
+        try {
+            normalize(pp);
 
-        if (newValue == null) {
-            newValue = "";
-        }
-
-        LimitationsType lims = pp.getStringPolicy().getLimitations();
-
-        testMinimalLength(newValue, lims, result, messages);
-        testMaximalLength(newValue, lims, result, messages);
-
-        testMinimalUniqueCharacters(newValue, lims, result, messages);
+            if (newValue == null) {
+                newValue = "";
+            }
 
-        testProhibitedValues(newValue, pp.getProhibitedValues(), originResolver, shortDesc, task, result, messages);
+            LimitationsType lims = pp.getStringPolicy().getLimitations();
 
-        // TODO: this needs to be determined from ValuePolicyType archetype
-        ExpressionProfile expressionProfile = MiscSchemaUtil.getExpressionProfile();
-        testCheckExpression(newValue, lims, expressionProfile, originResolver, shortDesc, task, result, messages);
+            testMinimalLength(newValue, lims, result, messages);
+            testMaximalLength(newValue, lims, result, messages);
 
-        if (!lims.getLimit().isEmpty()) {
-            // check limitation
-            HashSet<String> validChars;
-            HashSet<String> allValidChars = new HashSet<>();
-            List<String> characters = StringPolicyUtils.stringTokenizer(newValue);
-            for (StringLimitType stringLimitationType : lims.getLimit()) {
-                OperationResult limitResult = new OperationResult("Tested limitation: " + stringLimitationType.getDescription());
+            testMinimalUniqueCharacters(newValue, lims, result, messages);
 
-                validChars = getValidCharacters(stringLimitationType.getCharacterClass(), pp);
-                int count = countValidCharacters(validChars, characters);
-                allValidChars.addAll(validChars);
-                testMinimalOccurrence(stringLimitationType, count, limitResult, messages);
-                testMaximalOccurrence(stringLimitationType, count, limitResult, messages);
-                testMustBeFirst(stringLimitationType, limitResult, messages, newValue, validChars);
+            testProhibitedValues(newValue, pp.getProhibitedValues(), originResolver, shortDesc, task, result, messages);
 
-                limitResult.computeStatus();
-                result.addSubresult(limitResult);
+            // TODO: this needs to be determined from ValuePolicyType archetype
+            ExpressionProfile expressionProfile = MiscSchemaUtil.getExpressionProfile();
+            testCheckExpression(newValue, lims, expressionProfile, originResolver, shortDesc, task, result, messages);
+
+            if (!lims.getLimit().isEmpty()) {
+                // check limitation
+                HashSet<String> validChars;
+                HashSet<String> allValidChars = new HashSet<>();
+                List<String> characters = StringPolicyUtils.stringTokenizer(newValue);
+                for (StringLimitType stringLimitationType : lims.getLimit()) {
+                    OperationResult limitResult = new OperationResult("Tested limitation: " + stringLimitationType.getDescription());
+
+                    validChars = getValidCharacters(stringLimitationType.getCharacterClass(), pp);
+                    int count = countValidCharacters(validChars, characters);
+                    allValidChars.addAll(validChars);
+                    testMinimalOccurrence(stringLimitationType, count, limitResult, messages);
+                    testMaximalOccurrence(stringLimitationType, count, limitResult, messages);
+                    testMustBeFirst(stringLimitationType, limitResult, messages, newValue, validChars);
+
+                    limitResult.computeStatus();
+                    result.addSubresult(limitResult);
+                }
+                testInvalidCharacters(characters, allValidChars, result, messages);
             }
-            testInvalidCharacters(characters, allValidChars, result, messages);
+        } catch (Throwable t) {
+            result.recordFatalError(t);
+            throw t;
+        } finally {
+            result.computeStatusIfUnknown();
         }
 
-        result.computeStatus();
         if (!result.isSuccess() && !messages.isEmpty()) {
             result.setUserFriendlyMessage(
                     new LocalizableMessageListBuilder()