From 615cbe230843cb3185f0f35ec4aa58fdc7075347 Mon Sep 17 00:00:00 2001
From: Kai Zimmermann <kai.zimmermann@bosch-si.com>
Date: Wed, 1 Jun 2016 13:17:40 +0200
Subject: [PATCH] Added null check for selected target

---
 .../hawkbit-repository-jpa/.gitignore         |  1 +
 .../actionhistory/ActionHistoryTable.java     | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 hawkbit-repository/hawkbit-repository-jpa/.gitignore

diff --git a/hawkbit-repository/hawkbit-repository-jpa/.gitignore b/hawkbit-repository/hawkbit-repository-jpa/.gitignore
new file mode 100644
index 000000000..ae3c17260
--- /dev/null
+++ b/hawkbit-repository/hawkbit-repository-jpa/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java
index b571bb3df..f4cf633cb 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java
@@ -69,14 +69,15 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- *
+ * Table for {@link Target#getActions()} history.
  *
  */
-
 @SpringComponent
 @ViewScope
 public class ActionHistoryTable extends TreeTable implements Handler {
 
+    private static final String BUTTON_CANCEL = "button.cancel";
+    private static final String BUTTON_OK = "button.ok";
     private static final long serialVersionUID = -1631514704696786653L;
     @Autowired
     private I18N i18n;
@@ -241,11 +242,14 @@ public class ActionHistoryTable extends TreeTable implements Handler {
 
     private void getcontainerData() {
         hierarchicalContainer.removeAllItems();
-        /* service method to create action history for target */
-        final List<ActionWithStatusCount> actionHistory = deploymentManagement
+        
+        if (target != null) {
+            /* service method to create action history for target */
+            final List<ActionWithStatusCount> actionHistory = deploymentManagement
                 .findActionsWithStatusCountByTargetOrderByIdDesc(target);
-
-        addDetailsToContainer(actionHistory);
+            
+            addDetailsToContainer(actionHistory);
+        }
     }
 
     /**
@@ -751,7 +755,7 @@ public class ActionHistoryTable extends TreeTable implements Handler {
     private void confirmAndForceAction(final Long actionId) {
         /* Display the confirmation */
         final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.force.action.confirmbox"),
-                i18n.get("message.force.action.confirm"), i18n.get("button.ok"), i18n.get("button.cancel"), ok -> {
+                i18n.get("message.force.action.confirm"), i18n.get(BUTTON_OK), i18n.get(BUTTON_CANCEL), ok -> {
                     if (ok) {
                         /* cancel the action */
                         deploymentManagement.forceTargetAction(actionId);
@@ -773,7 +777,7 @@ public class ActionHistoryTable extends TreeTable implements Handler {
     private void confirmAndForceQuitAction(final Long actionId) {
         /* Display the confirmation */
         final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.forcequit.action.confirmbox"),
-                i18n.get("message.forcequit.action.confirm"), i18n.get("button.ok"), i18n.get("button.cancel"), ok -> {
+                i18n.get("message.forcequit.action.confirm"), i18n.get(BUTTON_OK), i18n.get(BUTTON_CANCEL), ok -> {
                     if (ok) {
                         final boolean cancelResult = forceQuitActiveAction(actionId);
                         if (cancelResult) {
@@ -801,7 +805,7 @@ public class ActionHistoryTable extends TreeTable implements Handler {
      */
     private void confirmAndCancelAction(final Long actionId) {
         final ConfirmationDialog confirmDialog = new ConfirmationDialog(i18n.get("caption.cancel.action.confirmbox"),
-                i18n.get("message.cancel.action.confirm"), i18n.get("button.ok"), i18n.get("button.cancel"), ok -> {
+                i18n.get("message.cancel.action.confirm"), i18n.get(BUTTON_OK), i18n.get(BUTTON_CANCEL), ok -> {
                     if (ok) {
                         final boolean cancelResult = cancelActiveAction(actionId);
                         if (cancelResult) {