Fix early return condition.

Author: ilonatommy

src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs

@@ -39,6 +39,7 @@ private async Task RenderComponentCore(HttpContext context)
     {
         context.Response.ContentType = RazorComponentResultExecutor.DefaultContentType;
         var isErrorHandler = context.Features.Get<IExceptionHandlerFeature>() is not null;
+        var hasStatusCodePage = context.Features.Get<IStatusCodePagesFeature>() is not null;
         var isReExecuted = context.Features.Get<IStatusCodeReExecuteFeature>() is not null;
         if (isErrorHandler)
         {
@@ -90,7 +91,6 @@ await _renderer.InitializeStandardComponentServicesAsync(
         await using var writer = new HttpResponseStreamWriter(context.Response.Body, Encoding.UTF8, defaultBufferSize, ArrayPool<byte>.Shared, ArrayPool<char>.Shared);
         using var bufferWriter = new BufferedTextWriter(writer);
 
-        int originalStatusCode = context.Response.StatusCode;
         bool isErrorHandlerOrReExecuted = isErrorHandler || isReExecuted;
 
         // Note that we always use Static rendering mode for the top-level output from a RazorComponentResult,
@@ -102,13 +102,10 @@ await _renderer.InitializeStandardComponentServicesAsync(
             ParameterView.Empty,
             waitForQuiescence: result.IsPost || isErrorHandlerOrReExecuted);
 
-        bool isReExecutionRequested = context.Features.Get<IStatusCodeReExecuteFeature>() is not null;
-        bool avoidStartingResponse = !isReExecuted && isReExecutionRequested;
+        bool avoidStartingResponse = hasStatusCodePage && !isReExecuted && context.Response.StatusCode == StatusCodes.Status404NotFound;
         if (avoidStartingResponse)
         {
-            // re-execution feature was set during rendering,
-            // we should finish early to avoid writing to the response
-            // and let the re-execution middleware take care of it
+            // the request is going to be re-executed, we should avoid writing to the response
             return;
         }
 

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs

@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Components.Endpoints.Rendering;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.RenderTree;
-using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -94,8 +93,6 @@ private async Task SetNotFoundResponseAsync(string baseUri)
             _httpContext.Response.StatusCode = StatusCodes.Status404NotFound;
             _httpContext.Response.ContentType = null;
         }
-        var statusCodeFeature = new StatusCodeReExecuteFeature();
-        _httpContext.Features.Set<IStatusCodeReExecuteFeature>(statusCodeFeature);
         SignalRendererToFinishRendering();
     }