Merge branch 'post-3.7-fixes' of https://github.com/Evolveum/midpoint …

…into post-3.7-fixes
Evolveum · Dec 18, 2017 · b874ad7 · b874ad7
2 parents b1a452d + 599eafa
commit b874ad7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
@@ -755,7 +755,7 @@ public static boolean matchOnOid(ObjectReferenceType ref1, ObjectReferenceType r
 	}
 
 	public static void mergeExtension(PrismContainerValue<?> dstExtensionContainerValue, PrismContainerValue<?> srcExtensionContainerValue) throws SchemaException {
-		for (Item<?,?> srcExtensionItem: srcExtensionContainerValue.getItems()) {
+		for (Item<?,?> srcExtensionItem: emptyIfNull(srcExtensionContainerValue.getItems())) {
 			Item<?,?> magicItem = dstExtensionContainerValue.findItem(srcExtensionItem.getElementName());
 			if (magicItem == null) {
 				//noinspection unchecked

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
@@ -681,7 +681,7 @@ private static void  mergeExtensionContainers(Item<PrismContainerValue<Assignmen
     		return;
     	}
     	PrismContainer<AssignmentType> dstContainer = (PrismContainer<AssignmentType>) dstItem;
-    	if (srcExtension != null && !srcExtension.getValues().isEmpty()) {
+    	if (srcExtension != null && !srcExtension.isEmpty()) {
 		    PrismContainer<?> dstExtensionContainer = dstContainer.findOrCreateContainer(AssignmentType.F_EXTENSION);
 		    PrismContainerValue<?> dstExtensionContainerValue = dstExtensionContainer.getValues().isEmpty()
 				    ? dstExtensionContainer.createNewValue() : dstExtensionContainer.getValue();

diff --git a/model/model-intest/src/test/resources/rbac/role-honorability.xml b/model/model-intest/src/test/resources/rbac/role-honorability.xml
@@ -21,6 +21,7 @@
         xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
         xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy">
     <name>Honorability</name>
+	<extension/>		<!-- MID-4354 -->
     <inducement>
     	<construction xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/10000000-0000-0000-0000-000000000004">
     		<resourceRef oid="10000000-0000-0000-0000-000000000004" type="c:ResourceType"/>