Fixing NPE in processing protected objects

Evolveum · Jun 16, 2015 · 35d1bdd · 35d1bdd
1 parent 99c633c
commit 35d1bdd
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java b/...mon/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
@@ -472,11 +472,17 @@ private static ResourceObjectPattern convertToPattern(ResourceObjectPatternType
 		// Deprecated
 		if (patternType.getName() != null) {
 			RefinedAttributeDefinition<String> attributeDefinition = rAccountDef.findAttributeDefinition(new QName(SchemaConstants.NS_ICF_SCHEMA,"name"));
+			if (attributeDefinition == null) {
+				throw new SchemaException("No ICF NAME attribute in schema as specified in the definition of protected objects (this is deprecated syntax anyway, convert it to filter)");
+			}
 			ResourceAttribute<String> attr = attributeDefinition.instantiate();
 			attr.setRealValue(patternType.getName());
 			resourceObjectPattern.addIdentifier(attr);
 		} else if (patternType.getUid() != null) {
 			RefinedAttributeDefinition attributeDefinition = rAccountDef.findAttributeDefinition(new QName(SchemaConstants.NS_ICF_SCHEMA,"uid"));
+			if (attributeDefinition == null) {
+				throw new SchemaException("No ICF UID attribute in schema as specified in the definition of protected objects (this is deprecated syntax anyway, convert it to filter)");
+			}
 			ResourceAttribute<String> attr = attributeDefinition.instantiate();
 			attr.setRealValue(patternType.getName());
 			resourceObjectPattern.addIdentifier(attr);