From 045900bdb81157aeef935d3e698d18194e8c7503 Mon Sep 17 00:00:00 2001
From: Richard Peter <richard.peter@raytheon.com>
Date: Thu, 8 May 2014 10:14:30 -0500
Subject: [PATCH] Issue #2726: Fix GeospatialDataGenerator NPE

Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0

Former-commit-id: 469f2771c3b98296384dae8d1ba82c08be88457f [formerly 5a7c78c009f6f00ade0664596c5754dbef10cded] [formerly 24539708f941c74b1822a6cb90cbc18b334696c8] [formerly 469f2771c3b98296384dae8d1ba82c08be88457f [formerly 5a7c78c009f6f00ade0664596c5754dbef10cded] [formerly 24539708f941c74b1822a6cb90cbc18b334696c8] [formerly 4d99d25a5538f4438475da095e5a5ef5a112e3f1 [formerly 24539708f941c74b1822a6cb90cbc18b334696c8 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]]
Former-commit-id: 4d99d25a5538f4438475da095e5a5ef5a112e3f1
Former-commit-id: a65504b301cd96f19bfb6cd4cd40b5bd75d4ae46 [formerly 3c21c1042f32a922a6a6896fb0a6e9e3e43a78d1] [formerly 3612a21996e81b3e6f673f5982a4a6b310ad9022 [formerly 29a8db5216892949497935e1c85b4a2a27c30699]]
Former-commit-id: 25a31e90dd26b0d819ae4d0ebd928e5b7e5f1143 [formerly 601f151a8bcde8c08e9c322379f9b5aa4829948a]
Former-commit-id: f5e8f07e8b8609a30551f95e736957aa302804cf
---
 .../warning/gis/GeospatialDataGenerator.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java b/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
index 4af2dce791..5e74490853 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
@@ -741,14 +741,18 @@ public class GeospatialDataGenerator {
     private String getTimeStamp(GeospatialTime curTime,
             GeospatialTime lastRunTime) {
         long tmStampMs = 0;
-        if (curTime.getAreaSourceTime() != lastRunTime.getAreaSourceTime()) {
+        if (lastRunTime != null) {
+            if (curTime.getAreaSourceTime() != lastRunTime.getAreaSourceTime()) {
+                tmStampMs = curTime.getAreaSourceTime();
+            } else if (curTime.getParentSourceTime() != lastRunTime
+                    .getParentSourceTime()) {
+                tmStampMs = curTime.getParentSourceTime();
+            } else if (curTime.getTimeZoneSourceTime() != lastRunTime
+                    .getTimeZoneSourceTime()) {
+                tmStampMs = curTime.getTimeZoneSourceTime();
+            }
+        } else {
             tmStampMs = curTime.getAreaSourceTime();
-        } else if (curTime.getParentSourceTime() != lastRunTime
-                .getParentSourceTime()) {
-            tmStampMs = curTime.getParentSourceTime();
-        } else if (curTime.getTimeZoneSourceTime() != lastRunTime
-                .getTimeZoneSourceTime()) {
-            tmStampMs = curTime.getTimeZoneSourceTime();
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");