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

Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1

Browse source 
Former-commit-id: c2766190a4 [formerly 5fad6501a7] [formerly b3df7745d4 [formerly 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d]]
Former-commit-id: b3df7745d4
Former-commit-id: 752fe50104
This commit is contained in:
Nate Jensen 2014-06-16 09:00:47 -05:00 • committed by Gerrit Code Review
commit ca06c42305
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
View file

@ -40,6 +40,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.DataTimeComparator;
import com.raytheon.uf.common.time.SimulatedTime;
import com.raytheon.uf.viz.core.AbstractTimeMatcher;
import com.raytheon.uf.viz.core.IDisplayPane;
@ -71,12 +72,17 @@ import com.raytheon.uf.viz.d2d.core.D2DLoadProperties;
* <pre>
*
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 10, 2009 chammack Initial creation
* Jul 03, 2013 2159 bsteffen Synchronize TimeCache access.
* Aug 9, 2013 DR 16448 D. Friedman Validate time match basis in redoTimeMatching
* May 5, 2014 DR 17201 D. Friedman Make same-radar time matching work more like A1.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Feb 10, 2009 chammack Initial creation
* Jul 03, 2013 2159 bsteffen Synchronize TimeCache access.
* Aug 9, 2013 16448 D. Friedman Validate time match basis in
* redoTimeMatching
* May 5, 2014 17201 D. Friedman Make same-radar time matching work more
* like A1.
* May 5, 2014 3265 bsteffen Better handling of resources returning
* null dataTimes.
*
*
* </pre>
*
@ -791,7 +797,12 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
.getResourceData();
DataTime[] dt = resource.getDataTimes();
Arrays.sort(dt);
/*
* Passing in the comparator allows it to handle null times. Ideally
* there should be no null times but if there is this is not the
* place to break things.
*/
Arrays.sort(dt, new DataTimeComparator());
PluginDataObject[] pdo = arrd.getLatestPluginDataObjects(dataTimes,
dt);
if (pdo.length > 0) {