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

Issue #2726: Fix GeospatialDataGenerator NPE

Browse source 
Change-Id: I07213e17fcbbadea9a33471c390bb07472ba31e0

Former-commit-id: 469f2771c3 [formerly 5a7c78c009] [formerly 24539708f9] [formerly 469f2771c3 [formerly 5a7c78c009] [formerly 24539708f9] [formerly 4d99d25a55 [formerly 24539708f9 [formerly fdc542df454887a48f4a55ef6ea9594ff98b3345]]]]
Former-commit-id: 4d99d25a55
Former-commit-id: a65504b301 [formerly 3c21c1042f] [formerly 3612a21996e81b3e6f673f5982a4a6b310ad9022 [formerly 29a8db5216]]
Former-commit-id: 25a31e90dd26b0d819ae4d0ebd928e5b7e5f1143 [formerly 601f151a8b]
Former-commit-id: f5e8f07e8b
This commit is contained in:
Richard Peter 2014-05-08 10:14:30 -05:00
parent fe086727bb
commit 045900bdb8
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");