Merge branch 'master_14.2.2' (14.2.2-21) into omaha_14.2.2
Former-commit-id: 2c17b02a196584edbaa2cef33d8e9adc91567f8e
This commit is contained in:
commit
35130cb3f5
1 changed files with 1 additions and 1 deletions
|
@ -53,6 +53,7 @@ import com.raytheon.uf.common.time.DataTimeComparator;
|
||||||
* cease a null pointer exception.
|
* cease a null pointer exception.
|
||||||
* May 5, 2014 DR 17201 D. Friedman Make same-radar time matching work more like A1.
|
* 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.
|
* 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>
|
* </pre>
|
||||||
*
|
*
|
||||||
|
@ -657,7 +658,6 @@ public class TimeMatcher {
|
||||||
|
|
||||||
if (fspatial) {
|
if (fspatial) {
|
||||||
frameFcsts = dataFcsts;
|
frameFcsts = dataFcsts;
|
||||||
dtf = dt;
|
|
||||||
} else if (dtf > dt) {
|
} else if (dtf > dt) {
|
||||||
dt = dtf;
|
dt = dtf;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue