Fix nullability bug in BindingContext (#2646)

dotnet · Jan 21, 2020 · 18c5349 · 18c5349
1 parent ad8ff38
commit 18c5349
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/BindingContext.cs b/src/System.Windows.Forms/src/System/Windows/Forms/BindingContext.cs
@@ -70,7 +70,7 @@ IEnumerator IEnumerable.GetEnumerator()
         /// <summary>
         ///  Gets an object to use for synchronization (thread safety).
         /// </summary>
-        object ICollection.SyncRoot => null;
+        object ICollection.SyncRoot => this;
 
         /// <summary>
         ///  Gets the System.Windows.Forms.BindingManagerBase associated with the specified

diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingContextTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/BindingContextTests.cs
@@ -26,7 +26,7 @@ public void BindingContext_ICollection_GetProperties_ReturnsExpected()
         {
             ICollection context = new BindingContext();
             Assert.False(context.IsSynchronized);
-            Assert.Null(context.SyncRoot);
+            Assert.Same(context, context.SyncRoot);
             Assert.Empty(context);
         }