Fixed NPE in resource list + in RW.

Evolveum · May 27, 2016 · de42e95 · de42e95
1 parent 84a96e0
commit de42e95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -62,6 +62,7 @@
 import org.apache.wicket.resource.CoreLibrariesContributor;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.wicket.util.string.StringValue;
+import org.jetbrains.annotations.NotNull;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -712,6 +713,7 @@ public StringResourceModel createStringResource(Enum e) {
 		return createStringResource(resourceKey);
 	}
 
+	@NotNull
     public static StringResourceModel createStringResourceStatic(Component component, String resourceKey,
                                                                  Object... objects) {
         return new StringResourceModel(resourceKey, component).setModel(new Model<String>())

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java
@@ -103,13 +103,13 @@ private String getItemDefinitionName(ItemDefinition def) {
             return null;
         }
 
-        StringResourceModel nameModel = PageBase.createStringResourceStatic(null, def.getDisplayName());
-        if (nameModel != null){
-            if (StringUtils.isNotEmpty(nameModel.getString())) {
-                return nameModel.getString();
-            }
-        }
-        String name = def.getDisplayName();
+		if (def.getDisplayName() != null) {
+			StringResourceModel nameModel = PageBase.createStringResourceStatic(null, def.getDisplayName());
+			if (StringUtils.isNotEmpty(nameModel.getString())) {
+				return nameModel.getString();
+			}
+		}
+        String name = def.getDisplayName();		// TODO this is always null here, isn't it?
         if (StringUtils.isEmpty(name)) {
             name = def.getName().getLocalPart();
         }

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java b/...src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
@@ -201,7 +201,7 @@ public MappingType prepareDtoToSave(PrismContext prismContext) throws SchemaExce
         }
 
         if(condition != null){
-            if(mappingObject.getCondition() != null){
+            if (mappingObject.getCondition() == null) {
                 mappingObject.setCondition(new ExpressionType());
             }