attempt to fix npe in InlineMenuButtonColumn

Evolveum · Jan 27, 2017 · a5ce3e7 · a5ce3e7
1 parent a3cd86b
commit a5ce3e7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java b/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
@@ -151,18 +151,24 @@ private void menuItemClickPerformed(int id, AjaxRequestTarget target, IModel<T>
 
     @Override
     public boolean isButtonVisible(int id, IModel<T> model) {
-        if (model == null){
+        if (model == null || model.getObject() == null){
             return true;
         }
         if (id == InlineMenuItem.INLINE_MENU_ITEM_ID.ENABLE.getMenuItemId() &&
                 model.getObject() instanceof SelectableBean &&
                 ((SelectableBean) model.getObject()).getValue() instanceof FocusType){
             FocusType focus = (FocusType)((SelectableBean) model.getObject()).getValue();
+            if (focus.getActivation() == null){
+                return false;
+            }
             return ActivationStatusType.DISABLED.equals(focus.getActivation().getEffectiveStatus());
         } else if (id == InlineMenuItem.INLINE_MENU_ITEM_ID.DISABLE.getMenuItemId() &&
                 model.getObject() instanceof SelectableBean &&
                 ((SelectableBean) model.getObject()).getValue() instanceof FocusType){
             FocusType focus = (FocusType)((SelectableBean) model.getObject()).getValue();
+            if (focus.getActivation() == null){
+                return true;
+            }
             return !ActivationStatusType.DISABLED.equals(focus.getActivation().getEffectiveStatus());
         }
         return true;