Add missing null check for recovered property

(cherry picked from commit fbc0e84) Signed-off-by: Stefan Negrea <snegrea@redhat.com>
rhq-project · Dec 2, 2014 · fc66908 · fc66908
1 parent 1f3b3f2
commit fc66908
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...es/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertDataSource.java b/...es/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/AlertDataSource.java
@@ -214,7 +214,7 @@ public String hoverHTML(Object value, ListGridRecord record, int rowNum, int col
         recoveredField.setCellFormatter(new CellFormatter() {
             public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
                 Long recovered = listGridRecord.getAttributeAsLong("recovered");
-                if(recovered.longValue() > 0) {
+                if(recovered != null && recovered.longValue() > 0) {
                     Img checkedImg = new Img(ImageManager.getAlertStatusCheckedIcon(),80,16);
                     checkedImg.setImageType(ImageStyle.CENTER);
                     return checkedImg.getInnerHTML();
@@ -227,7 +227,7 @@ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
             @Override
             public String hoverHTML(Object o, ListGridRecord listGridRecord, int i, int i2) {
                 Long recovered = listGridRecord.getAttributeAsLong("recovered");
-                if(recovered.longValue() > 0) {
+                if(recovered != null && recovered.longValue() > 0) {
                     Date recoveredTime = listGridRecord.getAttributeAsDate("recoveredTime");
                     String recoveredTimeString = TimestampCellFormatter.format(recoveredTime,
                             TimestampCellFormatter.DATE_TIME_FORMAT_FULL);
@@ -462,8 +462,8 @@ public static ListGridRecord convert(Alert from) {
             record.setAttribute("acknowledgeTime", new Date(from.getAcknowledgeTime().longValue()));
         }
         record.setAttribute("acknowledgingSubject", from.getAcknowledgingSubject());
-        record.setAttribute("recovered", from.getRecoveryTime());
         if(from.getRecoveryTime() != null && from.getRecoveryTime().longValue() > 0) {
+            record.setAttribute("recovered", from.getRecoveryTime());
             record.setAttribute("recoveredTime", new Date(from.getRecoveryTime().longValue()));
         }