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

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java

@@ -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();
-			}
 		};
 	}