Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Jan 19, 2022 · f470185 · f470185
2 parents 427e785 + 63bd77e
commit f470185
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...va/com/evolveum/midpoint/model/impl/controller/AdminGuiConfigurationMergeManagerImpl.java b/...va/com/evolveum/midpoint/model/impl/controller/AdminGuiConfigurationMergeManagerImpl.java
@@ -141,10 +141,11 @@ private SummaryPanelSpecificationType mergeSummaryPanels(SummaryPanelSpecificati
 
     private GuiFlexibleLabelType mergeSummaryPanelFlexibleLabel(GuiFlexibleLabelType defaultSummaryPanelIdentifier, GuiFlexibleLabelType compiledSummaryPanelIdentifier) {
         if (compiledSummaryPanelIdentifier == null) {
-            return defaultSummaryPanelIdentifier.cloneWithoutId();
+            return defaultSummaryPanelIdentifier != null ? defaultSummaryPanelIdentifier.cloneWithoutId() : null;
         }
 
-        GuiFlexibleLabelType mergedFlexibleLabel = defaultSummaryPanelIdentifier.cloneWithoutId();
+        GuiFlexibleLabelType mergedFlexibleLabel = defaultSummaryPanelIdentifier != null ?
+                defaultSummaryPanelIdentifier.cloneWithoutId() : new GuiFlexibleLabelType();
         if (compiledSummaryPanelIdentifier.getVisibility() != null) {
             mergedFlexibleLabel.setVisibility(compiledSummaryPanelIdentifier.getVisibility());
         }