Merge branch 'release/13.2.1'

This commit is contained in:
Thiago Loureiro de Azevedo 2019-03-23 22:41:04 +01:00
commit 4ee63040b9
2 changed files with 5 additions and 6 deletions

View File

@ -144,7 +144,6 @@ namespace Ocelot.DependencyInjection
Services.AddWebEncoders(); Services.AddWebEncoders();
} }
public IOcelotBuilder AddSingletonDefinedAggregator<T>() public IOcelotBuilder AddSingletonDefinedAggregator<T>()
where T : class, IDefinedAggregator where T : class, IDefinedAggregator
{ {
@ -171,7 +170,8 @@ namespace Ocelot.DependencyInjection
if (global) if (global)
{ {
Services.AddTransient<THandler>(); Services.AddTransient<THandler>();
Services.AddTransient<GlobalDelegatingHandler>(s =>{ Services.AddTransient<GlobalDelegatingHandler>(s =>
{
var service = s.GetService<THandler>(); var service = s.GetService<THandler>();
return new GlobalDelegatingHandler(service); return new GlobalDelegatingHandler(service);
}); });

View File

@ -37,7 +37,6 @@ namespace Ocelot.Middleware.Multiplexer
var content = await contexts[0].DownstreamResponse.Content.ReadAsStringAsync(); var content = await contexts[0].DownstreamResponse.Content.ReadAsStringAsync();
contentBuilder.Append($"\"{responseKeys[k]}\":{content}"); contentBuilder.Append($"\"{responseKeys[k]}\":{content}");
} }
else else
{ {