From 3a7e8f3d385268b0db6b8d932b0925309462e48a Mon Sep 17 00:00:00 2001 From: Carlo van Driesten Date: Mon, 27 Jul 2026 08:59:12 +0200 Subject: [PATCH] fix(loader): pass injected parameters through the import loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit XmlScenarioImportLoader::Load(messageLogger, injectedParameters) forwards to the inner loader's single-argument overload, so the injected parameter map is dropped before parameter resolution ever sees it. Every embedder that resolves catalogs loses parameter injection silently — including openScenarioReader, which reads its -p parameter file, echoes the parameters it found, and then resolves the scenario as if none had been given, because CheckFile always goes through ExecuteImportParsingV1_x. Forward the map to the inner loader. The same line is affected in all four version loaders (v1_0, v1_1, v1_2, v1_3); the non-import XmlScenarioLoaderFactory path was already correct, which is why the behaviour depends on whether catalogs are resolved. Signed-off-by: Carlo van Driesten --- .../src/v1_0/loader/XmlScenarioImportLoaderV1_0.cpp | 2 +- .../src/v1_1/loader/XmlScenarioImportLoaderV1_1.cpp | 2 +- .../src/v1_2/loader/XmlScenarioImportLoaderV1_2.cpp | 2 +- .../src/v1_3/loader/XmlScenarioImportLoaderV1_3.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/openScenarioLib/src/v1_0/loader/XmlScenarioImportLoaderV1_0.cpp b/cpp/openScenarioLib/src/v1_0/loader/XmlScenarioImportLoaderV1_0.cpp index 8942eff2..9ace8ca4 100644 --- a/cpp/openScenarioLib/src/v1_0/loader/XmlScenarioImportLoaderV1_0.cpp +++ b/cpp/openScenarioLib/src/v1_0/loader/XmlScenarioImportLoaderV1_0.cpp @@ -50,7 +50,7 @@ namespace NET_ASAM_OPENSCENARIO std::shared_ptr XmlScenarioImportLoader::Load(std::shared_ptr messageLogger, std::map& injectedParameters) { - auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger)->GetAdapter(typeid(IOpenScenario).name())); + auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger, injectedParameters)->GetAdapter(typeid(IOpenScenario).name())); if (messageLogger->GetMessagesFilteredByWorseOrEqualToErrorLevel(ErrorLevel::ERROR).empty()) { diff --git a/cpp/openScenarioLib/src/v1_1/loader/XmlScenarioImportLoaderV1_1.cpp b/cpp/openScenarioLib/src/v1_1/loader/XmlScenarioImportLoaderV1_1.cpp index fcd5963d..82dbc2fc 100644 --- a/cpp/openScenarioLib/src/v1_1/loader/XmlScenarioImportLoaderV1_1.cpp +++ b/cpp/openScenarioLib/src/v1_1/loader/XmlScenarioImportLoaderV1_1.cpp @@ -51,7 +51,7 @@ namespace NET_ASAM_OPENSCENARIO std::shared_ptr XmlScenarioImportLoader::Load(std::shared_ptr messageLogger, std::map& injectedParameters) { - auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger)->GetAdapter(typeid(IOpenScenario).name())); + auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger, injectedParameters)->GetAdapter(typeid(IOpenScenario).name())); if (messageLogger->GetMessagesFilteredByWorseOrEqualToErrorLevel(ErrorLevel::ERROR).empty()) { diff --git a/cpp/openScenarioLib/src/v1_2/loader/XmlScenarioImportLoaderV1_2.cpp b/cpp/openScenarioLib/src/v1_2/loader/XmlScenarioImportLoaderV1_2.cpp index 566df15d..4abfe617 100644 --- a/cpp/openScenarioLib/src/v1_2/loader/XmlScenarioImportLoaderV1_2.cpp +++ b/cpp/openScenarioLib/src/v1_2/loader/XmlScenarioImportLoaderV1_2.cpp @@ -52,7 +52,7 @@ namespace NET_ASAM_OPENSCENARIO std::shared_ptr XmlScenarioImportLoader::Load(std::shared_ptr messageLogger, std::map& injectedParameters) { - auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger)->GetAdapter(typeid(IOpenScenario).name())); + auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger, injectedParameters)->GetAdapter(typeid(IOpenScenario).name())); if (messageLogger->GetMessagesFilteredByWorseOrEqualToErrorLevel(ErrorLevel::ERROR).empty()) { diff --git a/cpp/openScenarioLib/src/v1_3/loader/XmlScenarioImportLoaderV1_3.cpp b/cpp/openScenarioLib/src/v1_3/loader/XmlScenarioImportLoaderV1_3.cpp index 3062b272..d0c268e9 100644 --- a/cpp/openScenarioLib/src/v1_3/loader/XmlScenarioImportLoaderV1_3.cpp +++ b/cpp/openScenarioLib/src/v1_3/loader/XmlScenarioImportLoaderV1_3.cpp @@ -52,7 +52,7 @@ namespace NET_ASAM_OPENSCENARIO std::shared_ptr XmlScenarioImportLoader::Load(std::shared_ptr messageLogger, std::map& injectedParameters) { - auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger)->GetAdapter(typeid(IOpenScenario).name())); + auto openScenario = std::static_pointer_cast(_innerScenarioLoader->Load(messageLogger, injectedParameters)->GetAdapter(typeid(IOpenScenario).name())); if (messageLogger->GetMessagesFilteredByWorseOrEqualToErrorLevel(ErrorLevel::ERROR).empty()) {