Lock to serial devices array in event listener is now using SyncRoot (#109)

josesimoes · web-flow · commit 2d1fd47abc63 · 2022-09-15T18:46:23.000+01:00
diff --git a/System.IO.Ports/SerialDeviceEventListener.cs b/System.IO.Ports/SerialDeviceEventListener.cs
@@ -37,7 +37,7 @@ public bool OnEvent(BaseEvent ev)
             var serialDataEvent = (SerialDataEvent)ev;
             SerialPort device = null;
 
-            lock (_serialDevicesMap)
+            lock (_serialDevicesMap.SyncRoot)
             {
                 device = FindSerialDevice(serialDataEvent.SerialDeviceIndex);
             }
@@ -53,15 +53,15 @@ public bool OnEvent(BaseEvent ev)
 
         public void AddSerialDevice(SerialPort device)
         {
-            lock (_serialDevicesMap)
+            lock (_serialDevicesMap.SyncRoot)
             {
                 _serialDevicesMap.Add(device);
             }
         }
 
         public void RemoveSerialDevice(int index)
         {
-            lock (_serialDevicesMap)
+            lock (_serialDevicesMap.SyncRoot)
             {
                 var device = FindSerialDevice(index);
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public bool OnEvent(BaseEvent ev)`
`37`	`37`	`var serialDataEvent = (SerialDataEvent)ev;`
`38`	`38`	`SerialPort device = null;`
`39`	`39`
`40`		`- lock (_serialDevicesMap)`
	`40`	`+ lock (_serialDevicesMap.SyncRoot)`
`41`	`41`	`{`
`42`	`42`	`device = FindSerialDevice(serialDataEvent.SerialDeviceIndex);`
`43`	`43`	`}`
`@@ -53,15 +53,15 @@ public bool OnEvent(BaseEvent ev)`
`53`	`53`
`54`	`54`	`public void AddSerialDevice(SerialPort device)`
`55`	`55`	`{`
`56`		`- lock (_serialDevicesMap)`
	`56`	`+ lock (_serialDevicesMap.SyncRoot)`
`57`	`57`	`{`
`58`	`58`	`_serialDevicesMap.Add(device);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public void RemoveSerialDevice(int index)`
`63`	`63`	`{`
`64`		`- lock (_serialDevicesMap)`
	`64`	`+ lock (_serialDevicesMap.SyncRoot)`
`65`	`65`	`{`
`66`	`66`	`var device = FindSerialDevice(index);`
`67`	`67`