From 94ed899f265dba57fa85fa3eccb6deb50a8925f5 Mon Sep 17 00:00:00 2001
From: Surabhi <surabhi.mahawar@aurigait.com>
Date: Thu, 18 Aug 2022 11:18:53 +0530
Subject: [PATCH] minor fix

---
 .../java/com/uci/inbound/xmsg/XmsgHistoryController.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java b/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java
index 1c88a14..edef9f4 100644
--- a/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java
+++ b/src/main/java/com/uci/inbound/xmsg/XmsgHistoryController.java
@@ -306,12 +306,18 @@ public List<Map<String, Object>> filterMessageState(List<XMessageDAO> xMessageDA
                     }
                     daoMap.put("payload", payloadMap);
                     daoMap.put("sentTimestamp", sentMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                } else {
+                    daoMap.put("sentTimestamp", null);
                 }
                 if(deliverdMap.get(xMessageDAO.getMessageId()) != null) {
                     daoMap.put("deliveryTimestamp", deliverdMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                } else {
+                    daoMap.put("deliveryTimestamp", null);
                 }
                 if(readMap.get(xMessageDAO.getMessageId()) != null) {
                     daoMap.put("readTimestamp", readMap.get(xMessageDAO.getMessageId()).getTimestamp());
+                } else {
+                    daoMap.put("readTimestamp", null);
                 }
             } catch (Exception ex) {
                 log.error("Exception when fetching payload: "+ex.getMessage());