Bundle Start after Framework Stop race fix (CppMicroServices#990) (CppMicroServices#1189)

RobertLauferElektrobit · tcormackMW · web-flow · commit ad83e50265cd · 2025-07-30T08:34:02.000-04:00
Co-authored-by: tcormackMW &lt;113473781+tcormackMW@users.noreply.github.com&gt;
diff --git a/framework/src/util/FrameworkPrivate.cpp b/framework/src/util/FrameworkPrivate.cpp
@@ -160,7 +160,6 @@ namespace cppmicroservices
     {
         auto l = Lock();
         US_UNUSED(l);
-        auto writerLock = coreCtx->SetFrameworkStateAndBlockUntilComplete(true);
         bool wasActive = false;
         switch (static_cast<Bundle::State>(state.load()))
         {
@@ -305,7 +304,10 @@ namespace cppmicroservices
             {
                 StopAllBundles();
             }
-            coreCtx->Uninit0();
+            {
+                auto lock = coreCtx->SetFrameworkStateAndBlockUntilComplete(true);
+                coreCtx->Uninit0();
+            }
             {
                 auto l = Lock();
                 US_UNUSED(l);

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,6 @@ namespace cppmicroservices`
`160`	`160`	`{`
`161`	`161`	`auto l = Lock();`
`162`	`162`	`US_UNUSED(l);`
`163`		`- auto writerLock = coreCtx->SetFrameworkStateAndBlockUntilComplete(true);`
`164`	`163`	`bool wasActive = false;`
`165`	`164`	`switch (static_cast<Bundle::State>(state.load()))`
`166`	`165`	`{`
`@@ -305,7 +304,10 @@ namespace cppmicroservices`
`305`	`304`	`{`
`306`	`305`	`StopAllBundles();`
`307`	`306`	`}`
`308`		`- coreCtx->Uninit0();`
	`307`	`+ {`
	`308`	`+ auto lock = coreCtx->SetFrameworkStateAndBlockUntilComplete(true);`
	`309`	`+ coreCtx->Uninit0();`
	`310`	`+ }`
`309`	`311`	`{`
`310`	`312`	`auto l = Lock();`
`311`	`313`	`US_UNUSED(l);`