Implemented proper read lock for CopyTo span.

Open-NET-Libraries · Jul 4, 2021 · c43ebf4 · c43ebf4
1 parent 2a749e8
commit c43ebf4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/source/Open.Collections.csproj b/source/Open.Collections.csproj
@@ -17,7 +17,7 @@
 		<PackageProjectUrl>https://github.com/Open-NET-Libraries/Open.Collections/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Open-NET-Libraries/Open.Collections/</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>
-		<Version>2.10.3</Version>
+		<Version>2.11.1</Version>
 		<PackageReleaseNotes></PackageReleaseNotes>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/source/Synchronized/LockSynchronizedCollectionWrapper.cs b/source/Synchronized/LockSynchronizedCollectionWrapper.cs
@@ -119,7 +119,7 @@ public override void CopyTo(T[] array, int arrayIndex)
 		/// If the count was less than the target length, a new span representing the results.
 		/// Otherwise the target is returned.
 		/// </returns>
-		public Span<T> CopyTo(Span<T> span)
+		public override Span<T> CopyTo(Span<T> span)
 		{
 			lock (Sync) return InternalSource.CopyToSpan(span);
 		}

diff --git a/source/Synchronized/ReadWriteSynchronizedCollectionWrapper.cs b/source/Synchronized/ReadWriteSynchronizedCollectionWrapper.cs
@@ -78,6 +78,13 @@ public override void Export(ICollection<T> to)
 		public override void CopyTo(T[] array, int arrayIndex)
 			=> Sync.Read(() => InternalSource.CopyTo(array, arrayIndex));
 
+		/// <inheritdoc cref="ReadOnlyCollectionWrapper{T, TCollection}.CopyTo(Span{T})"/>
+		public override Span<T> CopyTo(Span<T> span)
+		{
+			using var read = Sync.ReadLock();
+			return InternalSource.CopyToSpan(span);
+		}
+
 		#endregion
 
 		#region Dispose