tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 19:10:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'catcherwong-fix-1045' into develop

Browse Source
This commit is contained in:
TomPallister
2020-01-19 17:20:53 +00:00
parent bec004cf8f 1723076874
commit 81c81b5a48
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
View File

@@ -1,6 +1,6 @@
namespace Ocelot.Requester
{
using Errors;
using Ocelot.Errors;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
@@ -23,7 +23,7 @@ namespace Ocelot.Requester
return _mappers[type](exception);
}
if (type == typeof(OperationCanceledException))
if (type == typeof(OperationCanceledException) || type.IsSubclassOf(typeof(OperationCanceledException)))
{
return new RequestCanceledError(exception.Message);
}

11
test/Ocelot.UnitTests/Requester/HttpExeptionToErrorMapperTests.cs
View File

@@ -38,6 +38,14 @@
error.ShouldBeOfType<RequestCanceledError>();
}
[Fact]
public void should_return_request_canceled_for_subtype()
{
var error = _mapper.Map(new SomeException());
error.ShouldBeOfType<RequestCanceledError>();
}
[Fact]
public void should_return_error_from_mapper()
{
@@ -56,5 +64,8 @@
error.ShouldBeOfType<AnyError>();
}
private class SomeException : OperationCanceledException
{ }
}
}