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

Merge branch 'master_13.5.1' into omaha_13.5.1

Browse source 
Former-commit-id: 08b105a492 [formerly 727eba03b9] [formerly 08b105a492 [formerly 727eba03b9] [formerly a687da6075 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]]
Former-commit-id: a687da6075
Former-commit-id: e5c50ad0b6 [formerly 522867f068]
Former-commit-id: 08a7c0831f
This commit is contained in:
Steve Harris 2013-08-15 12:46:48 -05:00
commit f8442ee983
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1001,7 +1001,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
} else if (rp.getProperties().isMapLayer()
|| rp.getProperties().isSystemResource()) {
continue;
} else if (rsc.getResourceData() instanceof IResourceGroup) {
} else if (rsc != null
&& rsc.getResourceData() instanceof IResourceGroup) {
if (validateTimeMatchBasis(((IResourceGroup) rsc.getResourceData())
.getResourceList())) {
return true;

4
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
View file

@ -73,6 +73,8 @@ import com.vividsolutions.jts.geom.Geometry;
* May 10, 2013 1951 rjpeter Updated ugcZones references
* May 31, 2013 DR 16264 D. Friedman Fix query in prepare method.
* Jun 05, 2013 DR 16279 D. Friedman Fix updating of issuance time for followups.
* Aug 14, 2013 DR 16483 Qinglu Lin Fixed no option issue in WarnGen dropdown menu after
* issuance of an CANCON and restart of CAVE.
* </pre>
*
* @author mschenke
@ -342,7 +344,7 @@ public class CurrentWarnings {
|| (action == WarningAction.EXP)) {
if ((rval != null)
&& (warning.getCountyheader().equals(
rval.getCountyheader()) || !warning
rval.getCountyheader()) || warning
.getUgcZones().containsAll(
rval.getUgcZones()))) {
rval = null;