diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java index 7a870e314a3..dda6540c44a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java @@ -101,19 +101,19 @@ private Map> collectAvailableDefinitions(String input) } } } else { - - for (ItemDefinition def : getSchemaDefinitionMap().get(getModelObject().getObjectType())) { - if (def.getName() != null) { - if (StringUtils.isBlank(input)) { - toSelect.put(def.getName().getLocalPart(), def); - } else { - if (def.getName().getLocalPart().startsWith(input)) { + if (getSchemaDefinitionMap().get(getModelObject().getObjectType()) != null) { + for (ItemDefinition def : getSchemaDefinitionMap().get(getModelObject().getObjectType())) { + if (def.getName() != null) { + if (StringUtils.isBlank(input)) { toSelect.put(def.getName().getLocalPart(), def); + } else { + if (def.getName().getLocalPart().startsWith(input)) { + toSelect.put(def.getName().getLocalPart(), def); + } } } } } - } // } return toSelect;