Fix User page (temporarily)

It failed for a user containing assignment of a focus mapping.
Evolveum · Apr 18, 2018 · 5e3a9a0 · 5e3a9a0
1 parent a7b31c9
commit 5e3a9a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapperFactory.java
@@ -303,7 +303,7 @@ public <O extends ObjectType, C extends Containerable> List<ItemWrapper> createP
 			createPropertyOrReferenceWrapper(itemDef, cWrapper, propertyOrReferenceWrappers, onlyEmpty, cWrapper.getPath());
 			createContainerWrapper(itemDef, cWrapper, containerWrappers, onlyEmpty, task);
 			} catch (Exception e) {
-				LoggingUtils.logUnexpectedException(LOGGER, "something strange happenned: " + e.getMessage(), e);
+				LoggingUtils.logUnexpectedException(LOGGER, "something strange happened: " + e.getMessage(), e);
 				System.out.println(e.getMessage());
 				throw new TunnelException(e);
 			}

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ExpressionWrapper.java
@@ -29,9 +29,9 @@ public ExpressionWrapper(@Nullable ContainerValueWrapper container, PrismPropert
             if (outboundValue != null) {
                 PrismContainer associationContainer = (PrismContainer) outboundValue.getParent();
                 if (associationContainer != null) {
-                    PrismContainerValue<ConstructionType> constructionContainer = (PrismContainerValue<ConstructionType>) associationContainer.getParent();
-                    if (constructionContainer != null) {
-                        construction = constructionContainer.asContainerable();
+                    PrismContainerValue<?> constructionContainer = (PrismContainerValue<?>) associationContainer.getParent();
+                    if (constructionContainer != null && constructionContainer.asContainerable() instanceof ConstructionType) {
+                        construction = (ConstructionType) constructionContainer.asContainerable();
                     }
                 }
             }