Fixing failed test in model-intest.

Evolveum · Jul 16, 2014 · 0be2653 · 0be2653
1 parent 6166d4e
commit 0be2653
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
@@ -998,7 +998,7 @@ public PrismObjectDefinition determineDefinitionFromClass(Class type) {
 	 * in the known schemas.
 	 */
 	public boolean hasImplicitTypeDefinition(QName elementName, QName typeName) {
-        elementName = resolveElementNameIfNeeded(elementName);
+        elementName = resolveElementNameIfNeeded(elementName, false);
         if (elementName == null) {
             return false;
         }
@@ -1014,10 +1014,14 @@ public boolean hasImplicitTypeDefinition(QName elementName, QName typeName) {
 	}
 
     private QName resolveElementNameIfNeeded(QName elementName) {
+        return resolveElementNameIfNeeded(elementName, true);
+    }
+
+    private QName resolveElementNameIfNeeded(QName elementName, boolean exceptionIfAmbiguous) {
         if (StringUtils.isNotEmpty(elementName.getNamespaceURI())) {
             return elementName;
         }
-        ItemDefinition itemDef = resolveGlobalItemDefinitionWithoutNamespace(elementName.getLocalPart(), ItemDefinition.class);
+        ItemDefinition itemDef = resolveGlobalItemDefinitionWithoutNamespace(elementName.getLocalPart(), ItemDefinition.class, exceptionIfAmbiguous);
         if (itemDef != null) {
             return itemDef.getName();
         } else {
@@ -1053,6 +1057,10 @@ public ItemDefinition resolveGlobalItemDefinition(QName elementQName) throws Sch
 	}
 
     private <T extends ItemDefinition> T resolveGlobalItemDefinitionWithoutNamespace(String localPart, Class<T> definitionClass) {
+        return resolveGlobalItemDefinitionWithoutNamespace(localPart, definitionClass, true);
+    }
+
+    private <T extends ItemDefinition> T resolveGlobalItemDefinitionWithoutNamespace(String localPart, Class<T> definitionClass, boolean exceptionIfAmbiguous) {
         ItemDefinition found = null;
         for (SchemaDescription schemaDescription : parsedSchemas.values()) {
             PrismSchema schema = schemaDescription.getSchema();
@@ -1063,8 +1071,12 @@ private <T extends ItemDefinition> T resolveGlobalItemDefinitionWithoutNamespace
             if (def != null) {
                 if (found != null) {
                     // todo change to SchemaException
-                    throw new IllegalArgumentException("Multiple possible resolutions for unqualified element name " + localPart + " (e.g. in " +
+                    if (exceptionIfAmbiguous) {
+                        throw new IllegalArgumentException("Multiple possible resolutions for unqualified element name " + localPart + " (e.g. in " +
                             def.getNamespace() + " and " + found.getNamespace());
+                    } else {
+                        return null;
+                    }
                 }
                 found = def;
             }