SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2022-03-30 14:30:21 +02:00
parent b991442f90
commit fbb5c920c4
5 changed files with 9 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClient.java
View File

@@ -96,8 +96,7 @@ public class BlockingLoadBalancerClient implements LoadBalancerClient {
.forEach(lifecycle -> lifecycle.onStartRequest(lbRequest, new DefaultResponse(serviceInstance)));
try {
T response = request.apply(serviceInstance);
LoadBalancerProperties properties = loadBalancerClientFactory.getProperties(serviceId);
Object clientResponse = getClientResponse(response, properties.isUseRawStatusCodeInResponseData());
Object clientResponse = getClientResponse(response);
supportedLifecycleProcessors
.forEach(lifecycle -> lifecycle.onComplete(new CompletionContext<>(CompletionContext.Status.SUCCESS,
lbRequest, defaultResponse, clientResponse)));
@@ -116,16 +115,13 @@ public class BlockingLoadBalancerClient implements LoadBalancerClient {
return null;
}
private <T> Object getClientResponse(T response, boolean useRawStatusCodes) {
private <T> Object getClientResponse(T response) {
ClientHttpResponse clientHttpResponse = null;
if (response instanceof ClientHttpResponse) {
clientHttpResponse = (ClientHttpResponse) response;
}
if (clientHttpResponse != null) {
try {
if (useRawStatusCodes) {
return new ResponseData(null, clientHttpResponse);
}
return new ResponseData(clientHttpResponse, null);
}
catch (IOException ignored) {