fix of npe on the history tab

Evolveum · Dec 14, 2016 · f35e947 · f35e947
1 parent 3ed0f83
commit f35e947
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java
@@ -101,19 +101,19 @@ private Map<String, ItemDefinition<?>> 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;