Fix active locations when module override is empty.

jshiell · Jun 4, 2022 · b907c68 · b907c68
1 parent 047cf26
commit b907c68
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/org/infernus/idea/checkstyle/config/ConfigurationLocationSource.java b/src/main/java/org/infernus/idea/checkstyle/config/ConfigurationLocationSource.java
@@ -32,12 +32,17 @@ public SortedSet<ConfigurationLocation> getConfigurationLocations(@Nullable fina
             if (moduleConfiguration.isExcluded()) {
                 return Collections.emptySortedSet();
             }
+
             PluginConfiguration configuration = configurationManager().getCurrent();
-            return moduleConfiguration.getActiveLocationIds().stream()
+            TreeSet<ConfigurationLocation> moduleActiveConfigurations = moduleConfiguration.getActiveLocationIds().stream()
                     .map(id -> configuration.getLocationById(id).orElse(null))
                     .filter(Objects::nonNull)
                     .collect(Collectors.toCollection(TreeSet::new));
+            if (!moduleActiveConfigurations.isEmpty()) {
+                return moduleActiveConfigurations;
+            }
         }
+
         return configurationManager().getCurrent().getActiveLocations();
     }