Fixing shadow icon NPE

Evolveum · Apr 28, 2016 · a4dfec1 · a4dfec1
1 parent ce284ee
commit a4dfec1
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -152,6 +152,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ScheduleType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskBindingType;
@@ -1011,7 +1012,12 @@ public static String createShadowIcon(PrismObject<ShadowType> object) {
 			return GuiStyleConstants.CLASS_SHADOW_ICON_PROTECTED;
 		}
 
-		switch (shadow.getKind()){
+		ShadowKindType kind = shadow.getKind();
+		if (kind == null) {
+			return GuiStyleConstants.CLASS_SHADOW_ICON_UNKNOWN;
+		}
+
+		switch (kind){
 			case ACCOUNT: 
 				return GuiStyleConstants.CLASS_SHADOW_ICON_ACCOUNT;
 			case GENERIC:
@@ -1020,6 +1026,7 @@ public static String createShadowIcon(PrismObject<ShadowType> object) {
 				return GuiStyleConstants.CLASS_SHADOW_ICON_ENTITLEMENT;
 
 		}
+
 		return GuiStyleConstants.CLASS_SHADOW_ICON_UNKNOWN;
 	}