Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2

Former-commit-id: eaa4456fa7 [formerly eaa4456fa7 [formerly 2c17b02a196584edbaa2cef33d8e9adc91567f8e]]
Former-commit-id: 35130cb3f5
Former-commit-id: 0da15f729e
This commit is contained in:
Steve Harris 2014-07-23 13:07:11 -05:00
commit 9b3af6a2dd

View file

@ -53,6 +53,7 @@ import com.raytheon.uf.common.time.DataTimeComparator;
* cease a null pointer exception.
* May 5, 2014 DR 17201 D. Friedman Make same-radar time matching work more like A1.
* Aug 08, 2013 2245 bsteffen Make all DataTime comparisons consistent.
* Jul 18, 2014 ASM #15049 D. Friedman Fix LAPS problem introduced by DR 17201
*
* </pre>
*
@ -657,7 +658,6 @@ public class TimeMatcher {
if (fspatial) {
frameFcsts = dataFcsts;
dtf = dt;
} else if (dtf > dt) {
dt = dtf;
}