From 1aef8638d6d145f25515283f1d87bf58afdb61be Mon Sep 17 00:00:00 2001
From: Robert Stine <RobWStine@outlook.com>
Date: Wed, 29 May 2019 12:24:48 -0400
Subject: [PATCH] Update passenger watchlist timestamp to null check on hit
 count.

---
 .../main/java/gov/gtas/services/PassengerServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java
index 4e3ae680ab..141c8cc840 100644
--- a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java
+++ b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java
@@ -161,8 +161,10 @@ public PassengersPageDto getPassengersByCriteria(Long flightId, PassengersReques
                     }
                 }
             }
-            if (p.getPassengerWLTimestamp() != null && p.getPassengerWLTimestamp().getHitCount() > 0) {
-                vo.setOnWatchListLink(true);
+            if (p.getPassengerWLTimestamp() != null
+                    && p.getPassengerWLTimestamp().getHitCount() != null
+                    && p.getPassengerWLTimestamp().getHitCount() > 0) {
+                    vo.setOnWatchListLink(true);
             }
 
             // grab flight info