Merge pull request #376 from ncats/fix_npe

preventing an NPE when ChemicalUtils does not have a data file
ncats · Oct 23, 2024 · 9707f29 · 9707f29
2 parents 1745aca + 2236981
commit 9707f29
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/utils/ChemicalUtils.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/utils/ChemicalUtils.java
@@ -130,7 +130,11 @@ public class ChemicalUtils {
 
     @PostConstruct
     private void setUpSalts() {
-        log.warn("in setUpSalts, structureHandlingConfiguration.getSaltFilePath(): {}", structureHandlingConfiguration.getSaltFilePath());
+        if( structureHandlingConfiguration.getSaltFilePath() == null ) {
+            log.warn("ChemicalUtils - setUpSalts not initialized");
+            return;
+        }
+        log.trace("in setUpSalts, structureHandlingConfiguration.getSaltFilePath(): {}", structureHandlingConfiguration.getSaltFilePath());
         saltData = new HashMap<>();
         try {
             File file = new File(structureHandlingConfiguration.getSaltFilePath());