Cherry Pick 'fix memory leak of Monitored Items (#3324)' (#3325)

romanett · web-flow · commit c09d97c3af81 · 2025-11-08T07:48:51.000+01:00
* fix memory leak of Monitored Items (#3324) * update kestrel
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -10,7 +10,7 @@
     <PackageVersion Include="EmbedIO" Version="3.5.2" />
     <PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.3.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.3.6" />
     <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.3.0" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
diff --git a/Libraries/Opc.Ua.Server/NodeManager/MonitoredItem/MonitoredNodeMonitoredItemManager.cs b/Libraries/Opc.Ua.Server/NodeManager/MonitoredItem/MonitoredNodeMonitoredItemManager.cs
@@ -143,6 +143,7 @@ public StatusCode DeleteMonitoredItem(
             if (MonitoredNodes.TryGetValue(handle.NodeId, out MonitoredNode2 monitoredNode))
             {
                 monitoredNode.Remove(monitoredItem);
+                MonitoredItems.TryRemove(monitoredItem.Id, out _);
 
                 // check if node is no longer being monitored.
                 if (!monitoredNode.HasMonitoredItems)

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ public StatusCode DeleteMonitoredItem(`
`143`	`143`	`if (MonitoredNodes.TryGetValue(handle.NodeId, out MonitoredNode2 monitoredNode))`
`144`	`144`	`{`
`145`	`145`	`monitoredNode.Remove(monitoredItem);`
	`146`	`+ MonitoredItems.TryRemove(monitoredItem.Id, out _);`
`146`	`147`
`147`	`148`	`// check if node is no longer being monitored.`
`148`	`149`	`if (!monitoredNode.HasMonitoredItems)`