From f7b31b68d9a4d807d4af7b4bcff9b5f5aa469b0b Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 19 Sep 2020 05:54:09 -0400 Subject: [PATCH] ensure flex exclude domains are removed from flex domains --- .../java/bubble/service/stream/StandardAppPrimerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java b/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java index 89439164..f11086eb 100644 --- a/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java +++ b/bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java @@ -17,7 +17,6 @@ import bubble.service.device.DeviceService; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.cobbzilla.util.collection.SingletonList; -import org.cobbzilla.util.string.StringUtil; import org.cobbzilla.wizard.cache.redis.RedisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -204,6 +203,7 @@ public class StandardAppPrimerService implements AppPrimerService { AppRuleDriver.defineRedisFilterSet(redis, ip, app.getName() + ":" + app.getUuid(), filterDomains.toArray(String[]::new)); } if (!empty(flexDomains)) { + flexDomains.removeAll(flexExcludeDomains); AppRuleDriver.defineRedisFlexSet(redis, ip, app.getName() + ":" + app.getUuid(), flexDomains.toArray(String[]::new)); } if (!empty(flexExcludeDomains)) {