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

Omaha #3265 Fix potential NPE in D2D time matching.

Browse source 
Former-commit-id: 708dad6bec [formerly 0545a079a0] [formerly 9caf60a551] [formerly 9caf60a551 [formerly 81fbf3b697]] [formerly 708dad6bec [formerly 0545a079a0] [formerly 9caf60a551] [formerly 9caf60a551 [formerly 81fbf3b697]] [formerly 29b423645e [formerly 9caf60a551 [formerly 81fbf3b697] [formerly 29b423645e [formerly 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29]]]]]
Former-commit-id: 29b423645e
Former-commit-id: 45dd7cac49 [formerly 335708086d] [formerly 18f1cd9d5b] [formerly 0da2e7369f3bbac8db7a783bfae88ed6a852b9da [formerly 73020fa04763bf0f6d2782ad152a62f4c6003a05] [formerly 18f1cd9d5b [formerly b0ff6298f1]]]
Former-commit-id: f21acd84b06ee93d16413e4b737a675fc1bd4400 [formerly 354e98f1422b6bc62798a35aa673f684955f81eb] [formerly 6594b9dbd8 [formerly 07f36a59a7]]
Former-commit-id: 6594b9dbd8
Former-commit-id: 0cd83ff331
This commit is contained in:
Ben Steffensmeier 2014-06-13 16:51:33 -05:00
parent 28c37fa20f
commit b52728f0eb
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;
import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime; 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.common.time.SimulatedTime;
import com.raytheon.uf.viz.core.AbstractTimeMatcher; import com.raytheon.uf.viz.core.AbstractTimeMatcher;
import com.raytheon.uf.viz.core.IDisplayPane; import com.raytheon.uf.viz.core.IDisplayPane;
@ -71,12 +72,17 @@ import com.raytheon.uf.viz.d2d.core.D2DLoadProperties;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Feb 10, 2009 chammack Initial creation * Feb 10, 2009 chammack Initial creation
* Jul 03, 2013 2159 bsteffen Synchronize TimeCache access. * Jul 03, 2013 2159 bsteffen Synchronize TimeCache access.
* Aug 9, 2013 DR 16448 D. Friedman Validate time match basis in redoTimeMatching * Aug 9, 2013 16448 D. Friedman Validate time match basis in
* May 5, 2014 DR 17201 D. Friedman Make same-radar time matching work more like A1. * 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> * </pre>
* *
@ -791,7 +797,12 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
.getResourceData(); .getResourceData();
DataTime[] dt = resource.getDataTimes(); 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, PluginDataObject[] pdo = arrd.getLatestPluginDataObjects(dataTimes,
dt); dt);
if (pdo.length > 0) { if (pdo.length > 0) {