From 79abaa856d84248cd877f32e1ec296570a732f10 Mon Sep 17 00:00:00 2001 From: venu1278 Date: Mon, 8 Feb 2016 12:19:04 +0530 Subject: [PATCH] MECS-1477_NPE_when_user_tries_to_create_simple_targetfilter Signed-off-by: venu1278 --- .../ui/management/targettag/MultipleTargetFilter.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java index 56c4ea909..c4393e3aa 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java @@ -89,10 +89,11 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange filterByButtons.addStyleName(SPUIStyleDefinitions.NO_TOP_BORDER); targetFilterQueryButtonsTab.init(customTargetTagFilterButtonClick); - config = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ADD_TARGET_TAG, "", "", "", true, - FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class); - config.addClickListener(event -> settingsIconClicked()); - + if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) { + config = SPUIComponentProvider.getButton(SPUIComponetIdProvider.ADD_TARGET_TAG, "", "", "", true, + FontAwesome.COG, SPUIButtonStyleSmallNoBorder.class); + config.addClickListener(event -> settingsIconClicked()); + } addStyleName(ValoTheme.ACCORDION_BORDERLESS); addTabs(); setSizeFull(); @@ -123,7 +124,7 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange simpleFilterTab = new VerticalLayout(); final VerticalLayout targetTagTableLayout = new VerticalLayout(); targetTagTableLayout.setSizeFull(); - if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) { + if (null != config) { targetTagTableLayout.addComponent(config); targetTagTableLayout.setComponentAlignment(config, Alignment.TOP_RIGHT); }