From a2b80a50f5716a79b90c0ddd659992c20ba2cd7a Mon Sep 17 00:00:00 2001 From: seanyu Date: Wed, 22 Mar 2023 12:33:34 +0800 Subject: [PATCH] fix merge conflict --- .../enhancement/resttemplate/EnhancedRestTemplateReporter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java index 9eaef03c5..0ec539eb9 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/resttemplate/EnhancedRestTemplateReporter.java @@ -129,7 +129,6 @@ public class EnhancedRestTemplateReporter extends AbstractPolarisReporterAdapter if (Boolean.parseBoolean(response.getHeaders().getFirst(POLARIS_CIRCUIT_BREAKER_FALLBACK_HEADER))) { return; } - ServiceCallResult resultRequest = createServiceCallResult(url); try { ServiceCallResult resultRequest = createServiceCallResult(url, response); Map loadBalancerContext = MetadataContextHolder.get().getLoadbalancerMetadata();