Block call until engine ready #ahdis/matchbox/331

ahdis · Jan 15, 2025 · 2b05c89 · 2b05c89
1 parent 62793fb
commit 2b05c89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/interceptors/MappingLanguageInterceptor.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/interceptors/MappingLanguageInterceptor.java
@@ -165,7 +165,7 @@ private FhirVersionEnum extractFhirVersion(final String header) {
 	public String compileAndSerializeMap(final String mapText,
 													 final FhirVersionEnum fhirVersion,
 													 final @Nullable String structureMapId) throws IOException {
-		StructureMap mapR5 = MatchboxEngineSupport.mainEngine.parseMapR5(mapText);
+		StructureMap mapR5 = matchboxEngineSupport.getMatchboxEngine("default", null, false, false).parseMapR5(mapText);
 		if (structureMapId != null) {
 			mapR5.setId(structureMapId);
 		}

diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxEngineSupport.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxEngineSupport.java
@@ -41,7 +41,7 @@ public class MatchboxEngineSupport {
 
 	protected static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(MatchboxEngineSupport.class);
 
-	public static MatchboxEngine mainEngine = null;
+	private static MatchboxEngine mainEngine = null;
 	private EngineSessionCache sessionCache;
 
 	private boolean initialized = false;