Semaphores wait position fix to wait only if needed

Author: i4004

src/Simplify.Web/Modules/WebContext.cs

@@ -11,8 +11,8 @@ namespace Simplify.Web.Modules
 	/// </summary>
 	public class WebContext : IWebContext
 	{
-		private readonly SemaphoreSlim _formReadLock = new SemaphoreSlim(1, 1);
-		private readonly SemaphoreSlim _requestBodyReadLock = new SemaphoreSlim(1, 1);
+		private readonly SemaphoreSlim _formReadSemaphore = new SemaphoreSlim(1, 1);
+		private readonly SemaphoreSlim _requestBodyReadSemaphore = new SemaphoreSlim(1, 1);
 
 		private IFormCollection? _form;
 		private string? _requestBody;
@@ -134,18 +134,18 @@ public string RequestBody
 		/// </summary>
 		public async Task ReadFormAsync()
 		{
-			await _formReadLock.WaitAsync();
-
 			if (_form != null)
 				return;
 
+			await _formReadSemaphore.WaitAsync();
+
 			try
 			{
 				_form = await Context.Request.ReadFormAsync();
 			}
 			finally
 			{
-				_formReadLock.Release();
+				_formReadSemaphore.Release();
 			}
 		}
 
@@ -154,11 +154,11 @@ public async Task ReadFormAsync()
 		/// </summary>
 		public async Task ReadRequestBodyAsync()
 		{
-			await _requestBodyReadLock.WaitAsync();
-
 			if (_requestBody != null)
 				return;
 
+			await _requestBodyReadSemaphore.WaitAsync();
+
 			try
 			{
 				using var reader = new StreamReader(Context.Request.Body);
@@ -167,7 +167,7 @@ public async Task ReadRequestBodyAsync()
 			}
 			finally
 			{
-				_requestBodyReadLock.Release();
+				_requestBodyReadSemaphore.Release();
 			}
 		}
 	}