Fix missing FactoryBuilder.Commit() in dictionary-based complex type loading paths (#3630)

Copilot · marcschier · web-flow · commit 4c78751f67c9 · 2026-03-19T21:10:06.000+01:00
* Fix missing Commit() after LoadDictionaryDataTypesAsync in ComplexTypeSystem

Co-authored-by: marcschier &lt;11168470+marcschier@users.noreply.github.com&gt;

---------

Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: marcschier &lt;11168470+marcschier@users.noreply.github.com&gt;
diff --git a/Libraries/Opc.Ua.Client.ComplexTypes/ComplexTypeSystem.cs b/Libraries/Opc.Ua.Client.ComplexTypes/ComplexTypeSystem.cs
@@ -264,6 +264,7 @@ public async Task<bool> LoadNamespaceAsync(
                 serverStructTypes = [.. serverStructTypes.Where(
                     rd => rd.NodeId.NamespaceIndex == nameSpaceIndex)];
                 // load types
+                bool allTypesLoaded;
                 if (DisableDataTypeDefinition ||
                     !await LoadBaseDataTypesAsync(serverEnumTypes, serverStructTypes, ct)
                         .ConfigureAwait(false))
@@ -272,12 +273,16 @@ public async Task<bool> LoadNamespaceAsync(
                     {
                         return false;
                     }
-                    return await LoadDictionaryDataTypesAsync(serverEnumTypes, false, ct)
+                    allTypesLoaded = await LoadDictionaryDataTypesAsync(serverEnumTypes, false, ct)
                         .ConfigureAwait(false);
                 }
+                else
+                {
+                    allTypesLoaded = true;
+                }
                 // Commit the changes to the factory
                 m_complexTypeResolver.FactoryBuilder.Commit();
-                return true;
+                return allTypesLoaded;
             }
             catch (Exception ex)
             {
@@ -338,6 +343,7 @@ public async ValueTask<bool> LoadAsync(
                     : (await m_complexTypeResolver
                         .LoadDataTypesAsync(DataTypeIds.Structure, true, ct: ct)
                         .ConfigureAwait(false)).ToList();
+                bool allTypesLoaded;
                 if (DisableDataTypeDefinition ||
                     !await LoadBaseDataTypesAsync(serverEnumTypes, serverStructTypes, ct)
                         .ConfigureAwait(false))
@@ -346,12 +352,16 @@ public async ValueTask<bool> LoadAsync(
                     {
                         return false;
                     }
-                    return await LoadDictionaryDataTypesAsync(serverEnumTypes, true, ct)
+                    allTypesLoaded = await LoadDictionaryDataTypesAsync(serverEnumTypes, true, ct)
                         .ConfigureAwait(false);
                 }
+                else
+                {
+                    allTypesLoaded = true;
+                }
                 // Commit the changes to the factory
                 m_complexTypeResolver.FactoryBuilder.Commit();
-                return true;
+                return allTypesLoaded;
             }
             catch (Exception ex)
             {

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,7 @@ public async Task<bool> LoadNamespaceAsync(`
`264`	`264`	`serverStructTypes = [.. serverStructTypes.Where(`
`265`	`265`	`rd => rd.NodeId.NamespaceIndex == nameSpaceIndex)];`
`266`	`266`	`// load types`
	`267`	`+ bool allTypesLoaded;`
`267`	`268`	`if (DisableDataTypeDefinition \|\|`
`268`	`269`	`!await LoadBaseDataTypesAsync(serverEnumTypes, serverStructTypes, ct)`
`269`	`270`	`.ConfigureAwait(false))`
`@@ -272,12 +273,16 @@ public async Task<bool> LoadNamespaceAsync(`
`272`	`273`	`{`
`273`	`274`	`return false;`
`274`	`275`	`}`
`275`		`- return await LoadDictionaryDataTypesAsync(serverEnumTypes, false, ct)`
	`276`	`+ allTypesLoaded = await LoadDictionaryDataTypesAsync(serverEnumTypes, false, ct)`
`276`	`277`	`.ConfigureAwait(false);`
`277`	`278`	`}`
	`279`	`+ else`
	`280`	`+ {`
	`281`	`+ allTypesLoaded = true;`
	`282`	`+ }`
`278`	`283`	`// Commit the changes to the factory`
`279`	`284`	`m_complexTypeResolver.FactoryBuilder.Commit();`
`280`		`- return true;`
	`285`	`+ return allTypesLoaded;`
`281`	`286`	`}`
`282`	`287`	`catch (Exception ex)`
`283`	`288`	`{`
`@@ -338,6 +343,7 @@ public async ValueTask<bool> LoadAsync(`
`338`	`343`	`: (await m_complexTypeResolver`
`339`	`344`	`.LoadDataTypesAsync(DataTypeIds.Structure, true, ct: ct)`
`340`	`345`	`.ConfigureAwait(false)).ToList();`
	`346`	`+ bool allTypesLoaded;`
`341`	`347`	`if (DisableDataTypeDefinition \|\|`
`342`	`348`	`!await LoadBaseDataTypesAsync(serverEnumTypes, serverStructTypes, ct)`
`343`	`349`	`.ConfigureAwait(false))`
`@@ -346,12 +352,16 @@ public async ValueTask<bool> LoadAsync(`
`346`	`352`	`{`
`347`	`353`	`return false;`
`348`	`354`	`}`
`349`		`- return await LoadDictionaryDataTypesAsync(serverEnumTypes, true, ct)`
	`355`	`+ allTypesLoaded = await LoadDictionaryDataTypesAsync(serverEnumTypes, true, ct)`
`350`	`356`	`.ConfigureAwait(false);`
`351`	`357`	`}`
	`358`	`+ else`
	`359`	`+ {`
	`360`	`+ allTypesLoaded = true;`
	`361`	`+ }`
`352`	`362`	`// Commit the changes to the factory`
`353`	`363`	`m_complexTypeResolver.FactoryBuilder.Commit();`
`354`		`- return true;`
	`364`	`+ return allTypesLoaded;`
`355`	`365`	`}`
`356`	`366`	`catch (Exception ex)`
`357`	`367`	`{`