Fix NPE when no active module configs are present (#576)

jshiell · Jun 6, 2022 · c9c9474 · c9c9474
1 parent bb5a037
commit c9c9474
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 # CheckStyle-IDEA Changelog
 
+* **5.67.2** Fix: NPE in active modules configurations (#576).
 * **5.67.1** Fix: Improve serialisation from legacy formats (#574).
 * **5.67.1** Fix: Fix serialisation of property values (#573).
 * **5.67.0** New: Added Checkstyle 10.3.

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ repositories {
 //   Project Metadata
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-version = '5.67.1'
+version = '5.67.2'
 
 intellij {
     version = 'IC-2021.1.3'

diff --git a/src/main/java/org/infernus/idea/checkstyle/config/ModuleConfigurationState.java b/src/main/java/org/infernus/idea/checkstyle/config/ModuleConfigurationState.java
@@ -43,7 +43,7 @@ public void setActiveLocationIds(@NotNull final SortedSet<String> activeLocation
 
     @NotNull
     public SortedSet<String> getActiveLocationIds() {
-        return activeLocationIds;
+        return Objects.requireNonNullElseGet(activeLocationIds, TreeSet::new);
     }
 
 
@@ -72,7 +72,7 @@ private List<ConfigurationLocation> configurationLocations() {
     public ModuleSettings getState() {
         final ModuleSettings settings = new ModuleSettings();
         settings.useLatestSerialisationFormat();
-        settings.setActiveLocationIds(Objects.requireNonNullElse(activeLocationIds, new TreeSet<>()));
+        settings.setActiveLocationIds(Objects.requireNonNullElseGet(activeLocationIds, TreeSet::new));
         settings.setExcludeFromScan(excludedFromScan);
         return settings;
     }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -15,7 +15,7 @@
 </p>
         ]]>
     </description>
-    <version>5.67.1</version>
+    <version>5.67.2</version>
     <idea-version since-build="211.7628.21"/>
     <vendor url="https://infernus.org/" email="jamie@infernus.org">Jamie Shiell</vendor>
 
@@ -24,6 +24,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>5.67.2: Fix: NPE in active modules configurations (#576).</li>
     <li>5.67.1: Fix: Improve serialisation from legacy formats (#574).</li>
     <li>5.67.1: Fix: Fix serialisation of property values (#573).</li>
     <li>5.67.0: New: Added Checkstyle 10.3.</li>