code review feedback

dotnet · Jul 12, 2021 · 139ca9c · 139ca9c
1 parent 0d5417f
commit 139ca9c
Showing 1 changed file with 21 additions and 36 deletions.
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/BrowserHttpHandler/BrowserHttpHandler.cs b/src/libraries/System.Net.Http/src/System/Net/Http/BrowserHttpHandler/BrowserHttpHandler.cs
@@ -139,7 +139,7 @@ public SslClientAuthenticationOptions SslOptions
 
         protected internal override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            throw new PlatformNotSupportedException ();
+            throw new PlatformNotSupportedException();
         }
 
         protected internal override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
@@ -323,22 +323,27 @@ protected internal override async Task<HttpResponseMessage> SendAsync(HttpReques
                 return httpResponse;
 
             }
-            catch (OperationCanceledException oce ) when (cancellationToken.IsCancellationRequested)
+            catch (OperationCanceledException oce) when (cancellationToken.IsCancellationRequested)
             {
                 throw CancellationHelper.CreateOperationCanceledException(oce, cancellationToken);
             }
             catch (JSException jse)
             {
-                if (jse.Message.StartsWith("AbortError"))
-                {
-                    throw CancellationHelper.CreateOperationCanceledException(jse, CancellationToken.None);
-                }
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    throw CancellationHelper.CreateOperationCanceledException(jse, cancellationToken);
-                }
-                throw new HttpRequestException(jse.Message, jse);
+                throw TranslateJSException(jse, cancellationToken);
+            }
+        }
+
+        private static Exception TranslateJSException(JSException jse, CancellationToken cancellationToken)
+        {
+            if (jse.Message.StartsWith("AbortError", StringComparison.Ordinal))
+            {
+                return CancellationHelper.CreateOperationCanceledException(jse, CancellationToken.None);
+            }
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return CancellationHelper.CreateOperationCanceledException(jse, cancellationToken);
             }
+            return new HttpRequestException(jse.Message, jse);
         }
 
         private sealed class WasmFetchResponse : IDisposable
@@ -415,11 +420,7 @@ private async Task<byte[]> GetResponseData(CancellationToken cancellationToken)
                 }
                 catch (JSException jse)
                 {
-                    if (jse.Message.StartsWith("AbortError"))
-                    {
-                        throw CancellationHelper.CreateOperationCanceledException(jse, cancellationToken);
-                    }
-                    throw new HttpRequestException(jse.Message, jse);
+                    throw TranslateJSException(jse, cancellationToken);
                 }
 
                 return _data;
@@ -503,21 +504,13 @@ public override async ValueTask<int> ReadAsync(Memory<byte> buffer, Cancellation
                             _reader = (JSObject)body.Invoke("getReader");
                         }
                     }
-                    catch (OperationCanceledException oce ) when (cancellationToken.IsCancellationRequested)
+                    catch (OperationCanceledException oce) when (cancellationToken.IsCancellationRequested)
                     {
                         throw CancellationHelper.CreateOperationCanceledException(oce, cancellationToken);
                     }
                     catch (JSException jse)
                     {
-                        if (jse.Message.StartsWith("AbortError"))
-                        {
-                            throw CancellationHelper.CreateOperationCanceledException(jse, CancellationToken.None);
-                        }
-                        if (cancellationToken.IsCancellationRequested)
-                        {
-                            throw CancellationHelper.CreateOperationCanceledException(jse, cancellationToken);
-                        }
-                        throw new HttpRequestException(jse.Message, jse);
+                        throw TranslateJSException(jse, cancellationToken);
                     }
                 }
 
@@ -547,21 +540,13 @@ public override async ValueTask<int> ReadAsync(Memory<byte> buffer, Cancellation
                             _bufferedBytes = binValue.ToArray();
                     }
                 }
-                catch (OperationCanceledException oce ) when (cancellationToken.IsCancellationRequested)
+                catch (OperationCanceledException oce) when (cancellationToken.IsCancellationRequested)
                 {
                     throw CancellationHelper.CreateOperationCanceledException(oce, cancellationToken);
                 }
                 catch (JSException jse)
                 {
-                    if (jse.Message.StartsWith("AbortError"))
-                    {
-                        throw CancellationHelper.CreateOperationCanceledException(jse, CancellationToken.None);
-                    }
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        throw CancellationHelper.CreateOperationCanceledException(jse, cancellationToken);
-                    }
-                    throw new HttpRequestException(jse.Message, jse);
+                    throw TranslateJSException(jse, cancellationToken);
                 }
 
                 return ReadBuffered();