Also check map keys when determining if CORS configuration is present

kumuluz · Dec 1, 2022 · 0ac6900 · 0ac6900
1 parent 10bbe42
commit 0ac6900
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/kumuluz/ee/cors/CorsExtension.java b/src/main/java/com/kumuluz/ee/cors/CorsExtension.java
@@ -37,6 +37,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Logger;
@@ -63,7 +64,11 @@ public void init(KumuluzServerWrapper kumuluzServerWrapper, EeConfig eeConfig) {
 
             ConfigurationUtil cfg = ConfigurationUtil.getInstance();
 
-            boolean corsEnabled = cfg.getBoolean("kumuluzee.cors-filter.servlet.enabled").orElse(true);
+            boolean corsEnabled = cfg.getBoolean("kumuluzee.cors-filter.servlet.enabled").orElseGet(() -> {
+                Optional<List<String>> mapKeys = cfg.getMapKeys("kumuluzee.cors-filter.servlet");
+
+                return mapKeys.isPresent() && !mapKeys.get().isEmpty();
+            });
 
             CorsConfig corsConfig = null;