From f651a77acf7a1eefe95c7aa9f40180d7172134dd Mon Sep 17 00:00:00 2001 From: misselvexu Date: Wed, 29 Jun 2022 16:48:29 +0800 Subject: [PATCH] Resolve conflicts . --- .../PolarisRestTemplateResponseErrorHandler.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java index d0436e6c5..8a7dc16ab 100644 --- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java +++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java @@ -47,11 +47,7 @@ public class PolarisRestTemplateResponseErrorHandler implements ResponseErrorHan private static final Logger LOG = LoggerFactory.getLogger(PolarisRestTemplateResponseErrorHandler.class); -<<<<<<< HEAD - private static final String FILE_NAME = "connection"; -======= private static final String FIELD_NAME = "connection"; ->>>>>>> origin/improve/pr-322 private final ConsumerAPI consumerAPI; @@ -81,11 +77,7 @@ public class PolarisRestTemplateResponseErrorHandler implements ResponseErrorHan public void handleError(@NonNull URI url, @NonNull HttpMethod method, @NonNull ClientHttpResponse response) throws IOException { ServiceCallResult resultRequest = createServiceCallResult(url); try { -<<<<<<< HEAD - HttpURLConnection connection = (HttpURLConnection) ReflectionUtils.getFieldValue(response, FILE_NAME); -======= HttpURLConnection connection = (HttpURLConnection) ReflectionUtils.getFieldValue(response, FIELD_NAME); ->>>>>>> origin/improve/pr-322 if (connection != null) { URL realURL = connection.getURL(); resultRequest.setHost(realURL.getHost());