Issue #2249 availableTime now always return non-empty list.
Change-Id: Id0afee6e7673ff0eb062dc2deebacd89fece78ec Former-commit-id:b12987b714
[formerlydc846b2f2c
] [formerly4528b03c70
[formerly d29c0635c08e75cb956cf415ffcdfacd53c53fd8]] Former-commit-id:4528b03c70
Former-commit-id:4c61794a6f
This commit is contained in:
parent
6aab62b7b9
commit
550138a28a
1 changed files with 15 additions and 6 deletions
|
@ -20,8 +20,8 @@ import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
|
|||
import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
|
||||
import com.raytheon.uf.common.time.BinOffset;
|
||||
import com.raytheon.uf.common.time.DataTime;
|
||||
import com.raytheon.uf.common.time.SimulatedTime;
|
||||
import com.raytheon.uf.common.time.TimeRange;
|
||||
import com.raytheon.uf.common.time.util.TimeUtil;
|
||||
import com.raytheon.uf.viz.core.exception.VizException;
|
||||
import com.raytheon.uf.viz.core.requests.ThriftClient;
|
||||
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
|
||||
|
@ -40,6 +40,7 @@ import com.raytheon.viz.core.mode.CAVEMode;
|
|||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* May 3, 2011 jsanchez Initial creation
|
||||
* Oct 25, 2013 2249 rferrel getAvailableTimes always returns a non-empty list.
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
@ -143,11 +144,19 @@ public class WWAResourceData extends AbstractRequestableResourceData {
|
|||
&& phenSig.getConstraintValue().contains(".A") ? getWatchStartTimes(warnings)
|
||||
: getWarningStartTimes(warnings);
|
||||
|
||||
if (SimulatedTime.getSystemTime().isRealTime()) {
|
||||
// Add the current time to the end of the array.
|
||||
startTimes
|
||||
.add(new DataTime(SimulatedTime.getSystemTime().getTime()));
|
||||
}
|
||||
// DR2249
|
||||
// When not in real time the commented code allows availableTimes to be
|
||||
// empty. This causes Null pointer exceptions when getting frames. If
|
||||
// always placing non-realtime causes other problems may want to add
|
||||
// only when startTimes is empty:
|
||||
// if (SimulatedTime.getSystemTime().isRealTime()) {
|
||||
// // Add the current time to the end of the array.
|
||||
// startTimes.add(new
|
||||
// DataTime(SimulatedTime.getSystemTime().getTime()));
|
||||
// }
|
||||
|
||||
// Add current configured system time.
|
||||
startTimes.add(new DataTime(TimeUtil.newDate()));
|
||||
|
||||
DataTime[] availableTimes = startTimes.toArray(new DataTime[startTimes
|
||||
.size()]);
|
||||
|
|
Loading…
Add table
Reference in a new issue