From 6c74fee5e88073ec321e956f7c5a1dd5b00f2b08 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Wed, 7 Aug 2024 19:03:03 -0700 Subject: [PATCH] Remove unnecessary error signal from DefaultRestClient Before UnknownContentTypeException is thrown, it is added to the current Observation but since UnknownContentTypeException is a RestClientException, the exception is added again in one of the catch blocks later on. Closes gh-33347 --- .../org/springframework/web/client/DefaultRestClient.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java index 0e89d866928..253a1ad0e3f 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java +++ b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClient.java @@ -220,13 +220,10 @@ final class DefaultRestClient implements RestClient { return (T) messageConverter.read((Class)bodyClass, responseWrapper); } } - UnknownContentTypeException unknownContentTypeException = new UnknownContentTypeException(bodyType, contentType, + + throw new UnknownContentTypeException(bodyType, contentType, responseWrapper.getStatusCode(), responseWrapper.getStatusText(), responseWrapper.getHeaders(), RestClientUtils.getBody(responseWrapper)); - if (observation != null) { - observation.error(unknownContentTypeException); - } - throw unknownContentTypeException; } catch (UncheckedIOException | IOException | HttpMessageNotReadableException exc) { Throwable cause;