From d7c17f111812776359b57d48562e9d7edf682f9e Mon Sep 17 00:00:00 2001 From: Shay Carter Date: Tue, 28 Jun 2022 14:12:25 -0600 Subject: [PATCH] Small WWA change for sampling -make small change to support sampling on/off for sig weather resource --- .../viz/warnings/rsc/AbstractWWAResource.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java index 7aa439aa5a..5a39d7d06a 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java @@ -302,15 +302,18 @@ public abstract class AbstractWWAResource extends AbstractWarningRecord record = entry.record; String sig = record.getSig(); boolean samplingOn = false; - if(sig.equals(WATCH_SIG)){ - if(showWatchSampling()) - samplingOn = true; - }else if(sig.equals(WARN_SIG)){ - if(showWarnSampling()) - samplingOn = true; - }else if(sig.equals(ADVISORY_SIG)){ - if(showAdvisorySampling()) - samplingOn = true; + if(sig !=null){ + if(sig.equals(WATCH_SIG) && showWatchSampling()){ + samplingOn = true; + }else if(sig.equals(WARN_SIG) && showWarnSampling()){ + samplingOn = true; + }else if(sig.equals(ADVISORY_SIG) && showAdvisorySampling()){ + samplingOn = true; + }else{ + if(showOtherSampling()){ + samplingOn = true; + } + } }else{ if(showOtherSampling()) samplingOn = true;