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

Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2

Browse source 
Former-commit-id: c6b290a9243b74b8324a718db4b23cba252716bd
This commit is contained in:
Shawn.Hooper 2016-02-02 14:44:17 -05:00
commit 254cf29490
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
View file

@ -122,6 +122,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
* 06/29/2015 #4537 rferrel Allow for durations less then 1 hour.
* 07/13/2015 #4537 randerso Additional changes to allow D2DParms with sub-hourly durations/intervals
* 12/03/2015 #5168 randerso Added flag to use database time range if valid
* 01/27/2016 #5290 randerso Do not put null time ranges in the grid inventory.
*
* </pre>
*
@ -653,7 +654,9 @@ public class D2DGridDatabase extends VGridDatabase {
+ dataTime.getFcstTime());
}
}
invSet.add(tr);
if (tr != null) {
invSet.add(tr);
}
}
inventory = new ArrayList<TimeRange>(invSet);
} else {