Skip to content

Commit 6cd313f

Browse files
authored
Revert "Change MiddlewareFactory to type activate IMiddleware as a fallback (#988)" (#991)
This reverts commit 44d5bf0.
1 parent 9f64c69 commit 6cd313f

File tree

2 files changed

+1
-18
lines changed

2 files changed

+1
-18
lines changed

src/Microsoft.AspNetCore.Http/MiddlewareFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public MiddlewareFactory(IServiceProvider serviceProvider)
2424

2525
public IMiddleware Create(Type middlewareType)
2626
{
27-
return ActivatorUtilities.GetServiceOrCreateInstance(_serviceProvider, middlewareType) as IMiddleware;
27+
return _serviceProvider.GetRequiredService(middlewareType) as IMiddleware;
2828
}
2929

3030
public void Release(IMiddleware middleware)

test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -232,23 +232,6 @@ public async Task UseMiddlewareWithIMiddlewareWorks()
232232
Assert.Same(middlewareFactory.Created, middlewareFactory.Released);
233233
}
234234

235-
[Fact]
236-
public async Task UseMiddlewareWithIMiddlewareAndMiddlewareFactoryTypeActivates()
237-
{
238-
var mockServiceProvider = new DummyServiceProvider();
239-
var builder = new ApplicationBuilder(mockServiceProvider);
240-
builder.UseMiddleware(typeof(Middleware));
241-
var app = builder.Build();
242-
var context = new DefaultHttpContext();
243-
var sp = new DummyServiceProvider();
244-
var middlewareFactory = new MiddlewareFactory(sp);
245-
sp.AddService(typeof(IMiddlewareFactory), middlewareFactory);
246-
context.RequestServices = sp;
247-
await app(context);
248-
Assert.True(Assert.IsType<bool>(context.Items["before"]));
249-
Assert.True(Assert.IsType<bool>(context.Items["after"]));
250-
}
251-
252235
public class Middleware : IMiddleware
253236
{
254237
public async Task InvokeAsync(HttpContext context, RequestDelegate next)

0 commit comments

Comments
 (0)