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

Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1

Browse source 
Former-commit-id: fc905ca588 [formerly c8f486ed32dfffff69ff9e9fefe1320c4ec009f4]
Former-commit-id: ba2f130b13
This commit is contained in:
Nate Jensen 2014-06-12 15:14:50 -05:00 • committed by Gerrit Code Review
commit 254ba2762f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
View file

@ -84,6 +84,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* May 21, 2009 6309 garmendariz Modified path for Geotools 2.6.4
* May 01, 2014 3100 bsteffen perform time matching on data update.
* Jun 02, 2014 2918 bsteffen Make dataTimes a synchronized list.
* Jun 12, 2014 3263 bsteffen Check for null when async time matching.
*
*
* </pre>
@ -367,6 +368,15 @@ public class RadarMosaicResource extends
* off the UI thread, preferably in the timeUpdateJob.
*/
private void updateTimes() {
DataTime[] frameTimes = descriptor.getTimeMatchingMap().get(this);
if (frameTimes == null) {
/*
* This has not been time matched so cannot time match against
* mosaiced resources.
*/
issueRefresh();
return;
}
for (ResourcePair pair : getResourceList()) {
try {
if (!(pair.getResourceData() instanceof AbstractRequestableResourceData)) {
@ -375,8 +385,7 @@ public class RadarMosaicResource extends
AbstractRequestableResourceData arrd = (AbstractRequestableResourceData) pair
.getResourceData();
DataTime[] availableTimes = arrd.getAvailableTimes();
DataTime[] frameTimes = descriptor.getTimeMatchingMap().get(
this);
DataTime[] displayTimes = timeMatch(frameTimes, availableTimes);
// request any new times.
PluginDataObject[] pdos = arrd.getLatestPluginDataObjects(