npe fix for metadata panel

Evolveum · Sep 29, 2021 · 0b70dcc · 0b70dcc
1 parent 843dfd8
commit 0b70dcc
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValueMetadataPanel.java b/...gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismValueMetadataPanel.java
@@ -10,9 +10,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
-import com.evolveum.midpoint.prism.ItemDefinition;
-
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -22,11 +19,13 @@
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
+import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.impl.prism.panel.component.ContainersPopupDto;
 import com.evolveum.midpoint.gui.impl.prism.wrapper.ValueMetadataWrapperImpl;
 import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -228,15 +227,16 @@ private ReadOnlyModel<List<ContainersPopupDto>> createMetadataListModel() {
 
             List<PrismContainerDefinition<? extends Containerable>> childContainers;
             try {
-                childContainers = metadataWrapper.getChildContainers();
+                childContainers = metadataWrapper != null ? metadataWrapper.getChildContainers() : Collections.emptyList();
             } catch (SchemaException e) {
                 LOGGER.error("Cannot get child containers: {}", e.getMessage(), e);
                 childContainers = Collections.emptyList();
             }
 
             List<ContainersPopupDto> navigation = childContainers.stream().map(c -> new ContainersPopupDto(false, c)).collect(Collectors.toList());
 
-            List<? extends ItemDefinition> childNonContainers = metadataWrapper.getChildNonContainers();
+            List<? extends ItemDefinition> childNonContainers = metadataWrapper != null ? metadataWrapper.getChildNonContainers()
+                    : Collections.emptyList();
             if (!childNonContainers.isEmpty()) {
                 navigation.add(new ContainersPopupDto(false, metadataWrapper));
             }