xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2726: Fix GeospatialDataGenerator NPE" into omaha_14.3.1

Browse source 
Former-commit-id: b415dd5c4e [formerly 3fdd5dbdd6] [formerly 8f8ac40c44] [formerly d4fef60be1 [formerly 8f8ac40c44 [formerly 34d2d296f304cd84a8105993803ca35c484c6b6e]]]
Former-commit-id: d4fef60be1
Former-commit-id: a27e3174303ab185af39074281bca050c97c43f0 [formerly 04e906f1a6]
Former-commit-id: a50afc30eb
This commit is contained in:
Nate Jensen 2014-05-08 10:19:43 -05:00 • committed by Gerrit Code Review
commit c771f70e7d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
View file

@ -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");