fix

Author: p-hoffmann

src/main/java/org/ohdsi/webapi/trexsql/TrexSQLInstanceManager.java

@@ -85,16 +85,21 @@ private Map<String, Object> buildConfig() {
 
     @PreDestroy
     public void shutdown() {
-        if (trexsqlDb != null) {
-            log.info("Shutting down TrexSQL instance");
-            try {
-                Trexsql.shutdown(trexsqlDb);
-                log.info("TrexSQL instance shut down successfully");
-            } catch (Exception e) {
-                log.error("Error shutting down TrexSQL instance: {}", e.getMessage(), e);
-            } finally {
-                trexsqlDb = null;
+        initLock.lock();
+        try {
+            if (trexsqlDb != null) {
+                log.info("Shutting down TrexSQL instance");
+                try {
+                    Trexsql.shutdown(trexsqlDb);
+                    log.info("TrexSQL instance shut down successfully");
+                } catch (Exception e) {
+                    log.error("Error shutting down TrexSQL instance: {}", e.getMessage(), e);
+                } finally {
+                    trexsqlDb = null;
+                }
             }
+        } finally {
+            initLock.unlock();
         }
     }
 }

src/main/java/org/ohdsi/webapi/trexsql/TrexSQLService.java

@@ -6,7 +6,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,8 +37,12 @@ public boolean isCacheAvailable(String sourceKey) {
         if (sourceConfig == null) {
             return false;
         }
-        String cachePath = config.getCachePath() + "/" + sourceConfig.getDatabaseCode() + ".db";
-        return new File(cachePath).exists();
+        String databaseCode = sourceConfig.getDatabaseCode();
+        if (databaseCode == null || databaseCode.isEmpty()) {
+            return false;
+        }
+        return Paths.get(config.getCachePath(), databaseCode + ".db")
+            .toFile().exists();
     }
 
     @SuppressWarnings("unchecked")
@@ -51,6 +55,9 @@ public List<Map<String, Object>> searchVocab(String sourceKey, String searchTerm
         }
 
         String databaseCode = sourceConfig.getDatabaseCode();
+        if (databaseCode == null || databaseCode.isEmpty()) {
+            throw new IllegalStateException("TrexSQL database code not configured for source: " + sourceKey);
+        }
 
         Map<String, Object> options = new HashMap<>();
         options.put("database-code", databaseCode);

src/main/java/org/ohdsi/webapi/trexsql/TrexSQLSourceConfig.java

@@ -1,7 +1,7 @@
 package org.ohdsi.webapi.trexsql;
 
 /**
- * Per-source configuration for trexsql integration.
+ * Per-source configuration for TrexSQL integration.
  * Maps to trexsql.sources.{sourceKey} in application properties.
  */
 public class TrexSQLSourceConfig {