Merge remote-tracking branch 'origin/3.0.x'

This commit is contained in:
Olga MaciaszekSharma
2021-07-26 17:03:58 +02:00

View File

@@ -106,7 +106,7 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
return () -> {
try {
RequestContextHolder.setRequestAttributes(requestAttributes);
return this.dispatch.get(method).invoke(args);
return dispatch.get(method).invoke(args);
}
catch (RuntimeException throwable) {
throw throwable;
@@ -114,9 +114,6 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler {
catch (Throwable throwable) {
throw new RuntimeException(throwable);
}
finally {
RequestContextHolder.resetRequestAttributes();
}
};
}