fix: fix RouterLabelRestTemplateInterceptor add response headers exce…

…ption with httpclient5 (#1267) Co-authored-by: gzoldou <gzoldou@163.com>
Tencent · Aug 13, 2024 · bd7d6f5 · bd7d6f5
1 parent 05af519
commit bd7d6f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,3 +4,4 @@
 - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1258)
 - [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1296)
 - [feat:upgrade jacoco version.](https://github.com/Tencent/spring-cloud-tencent/pull/1307)
+- [fix: fix RouterLabelRestTemplateInterceptor add response headers exception with httpclient5.](https://github.com/Tencent/spring-cloud-tencent/pull/1376)
diff --git a/...ava/com/tencent/cloud/polaris/router/resttemplate/RouterLabelRestTemplateInterceptor.java b/...ava/com/tencent/cloud/polaris/router/resttemplate/RouterLabelRestTemplateInterceptor.java
@@ -44,6 +44,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.core.Ordered;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -103,7 +104,8 @@ public ClientHttpResponse intercept(@NonNull HttpRequest request, @NonNull byte[
 		ClientHttpResponse response = clientHttpRequestExecution.execute(request, body);
 
 		if (!CollectionUtils.isEmpty(request.getHeaders().get(RouterConstant.ROUTER_LABEL_HEADER))) {
-			response.getHeaders().addAll(RouterConstant.ROUTER_LABEL_HEADER, Objects.requireNonNull(request.getHeaders()
+			HttpHeaders responseHeaders = HttpHeaders.writableHttpHeaders(response.getHeaders());
+			responseHeaders.addAll(RouterConstant.ROUTER_LABEL_HEADER, Objects.requireNonNull(request.getHeaders()
 					.get(RouterConstant.ROUTER_LABEL_HEADER)));
 		}