Fixing projection constraints checker for case insensitive icfs:name.…

… (By auto adding appropriate matching rule to the query if there's none.)
Evolveum · Jan 9, 2015 · e0ccb2a · e0ccb2a
1 parent d69921a
commit e0ccb2a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...rovisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java b/...rovisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
@@ -550,7 +550,7 @@ private <T> void processQueryMatchingRuleFilter(ObjectFilter filter, RefinedObje
 		}
 		EqualFilter<T> eqFilter = (EqualFilter)filter;
 		ItemPath parentPath = eqFilter.getParentPath();
-		if (parentPath == null || !parentPath.equals(SchemaConstants.PATH_ATTRIBUTES)) {
+		if (parentPath == null || !parentPath.equivalent(SchemaConstants.PATH_ATTRIBUTES)) {
 			return;
 		}
 		QName attrName = eqFilter.getElementName();
@@ -575,6 +575,10 @@ private <T> void processQueryMatchingRuleFilter(ObjectFilter filter, RefinedObje
 		eqFilter.getValues().addAll((Collection) newValues);
 		LOGGER.trace("Replacing values for attribute {} in search filter with normalized values because there is a matching rule, normalized values: {}",
 				attrName, newValues);
+		if (eqFilter.getMatchingRule() == null) {
+			eqFilter.setMatchingRule(matchingRuleQName);
+			LOGGER.trace("Setting matching rule to {}", matchingRuleQName);
+		}
 	}
 
 	/**