From d7abddd3051120922418c147f7fbdf2c43adcbab Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Fri, 18 Nov 2016 11:24:07 +0100 Subject: [PATCH] prevent NPE on unknown state of rollout group. (#355) Signed-off-by: Michael Hirsch --- .../hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java index a253f25a5..581d11e82 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java @@ -14,6 +14,7 @@ import java.util.EnumMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Optional; import org.eclipse.hawkbit.repository.RolloutGroupManagement; import org.eclipse.hawkbit.repository.SpPermissionChecker; @@ -357,7 +358,8 @@ public class RolloutGroupListGrid extends AbstractGrid { } private String convertRolloutGroupStatusToString(final RolloutGroupStatus value) { - final StatusFontIcon statusFontIcon = statusIconMap.get(value); + final StatusFontIcon statusFontIcon = Optional.of(statusIconMap.get(value)) + .orElse(new StatusFontIcon(FontAwesome.QUESTION_CIRCLE, SPUIStyleDefinitions.STATUS_ICON_BLUE)); final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon); return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(), UIComponentIdProvider.ROLLOUT_GROUP_STATUS_LABEL_ID);