Fix flag state filters on load

Signed-off-by: Pablete1234 <[email protected]>
PGMDev · Aug 4, 2022 · 080e659 · 080e659
1 parent 42c8279
commit 080e659
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/filters/matcher/match/FlagStateFilter.java b/core/src/main/java/tc/oc/pgm/filters/matcher/match/FlagStateFilter.java
@@ -41,7 +41,8 @@ public Class<? extends MatchQuery> queryType() {
   @Override
   public boolean matches(MatchQuery query) {
     Flag flag = this.flag.get().getGoal(query.getMatch());
-    if (flag == null) throw new IllegalStateException("Flag not found");
+    // FIXME: This may occur at load time. We need a better fix for this.
+    if (flag == null) return false;
 
     return flag.isCurrent(this.state) && (this.post == null || flag.isAtPost(this.post.get()));
   }

diff --git a/core/src/main/java/tc/oc/pgm/filters/parse/FeatureFilterParser.java b/core/src/main/java/tc/oc/pgm/filters/parse/FeatureFilterParser.java
@@ -29,7 +29,7 @@ public ContextStore<?> getUsedContext() {
   public Filter parse(Element el) throws InvalidXMLException {
     Filter filter = this.parseDynamic(el);
     if (!(filter instanceof FeatureReference)) {
-      factory.getFeatures().addFeature(el, (FilterDefinition) filter);
+      factory.getFeatures().addFeature(el, filter);
     }
     return filter;
   }