From f16f986eedb8394d1cddab68c4841f8846ebfa60 Mon Sep 17 00:00:00 2001 From: Stefan Behl Date: Thu, 9 May 2019 17:09:35 +0200 Subject: [PATCH] Auto-Assignment link missing in Target Filter view (caused by NPE in TargetFilterTable) (#835) * Add fallback to ActionType.FORCED for auto assignment filters Signed-off-by: Stefan Behl * add comment Signed-off-by: Stefan Behl * improve javadoc Signed-off-by: Stefan Behl --- .../ui/filtermanagement/TargetFilterBeanQuery.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java index 5f17f83fe..1b10d74e6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java @@ -13,6 +13,7 @@ import java.util.List; import java.util.Map; import org.eclipse.hawkbit.repository.TargetFilterQueryManagement; +import org.eclipse.hawkbit.repository.model.Action.ActionType; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.TargetFilterQuery; import org.eclipse.hawkbit.ui.common.UserDetailsFormatter; @@ -104,8 +105,13 @@ public class TargetFilterBeanQuery extends AbstractBeanQuery final DistributionSet distributionSet = tarFilterQuery.getAutoAssignDistributionSet(); if (distributionSet != null) { proxyTarFilter.setAutoAssignDistributionSet(new ProxyDistribution(distributionSet)); - proxyTarFilter.setAutoAssignActionType(tarFilterQuery.getAutoAssignActionType()); + // we need to apply a fallback since the action type field has + // been added belatedly (and might be null for older filters) + final ActionType autoAssignActionType = tarFilterQuery.getAutoAssignActionType(); + proxyTarFilter.setAutoAssignActionType( + autoAssignActionType != null ? autoAssignActionType : ActionType.FORCED); } + proxyTargetFilter.add(proxyTarFilter); } return proxyTargetFilter;