RestClientException should not be considered as client disconnected exception

Fix spring-projectsGH-34264

Signed-off-by: Yanming Zhou <[email protected]>

Author: quaff

spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 
 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.util.Assert;
+import org.springframework.web.client.RestClientException;
 
 /**
  * Utility methods to assist with identifying and logging exceptions that indicate
@@ -32,6 +33,7 @@
  * and a full stacktrace at TRACE level.
  *
  * @author Rossen Stoyanchev
+ * @author Yanming Zhou
  * @since 6.1
  */
 public class DisconnectedClientHelper {
@@ -83,6 +85,13 @@ else if (logger.isDebugEnabled()) {
 	 * </ul>
 	 */
 	public static boolean isClientDisconnectedException(Throwable ex) {
+		Throwable cause = ex;
+		while (cause != null) {
+			if (cause instanceof RestClientException) {
+				return false;
+			}
+			cause = cause.getCause();
+		}
 		String message = NestedExceptionUtils.getMostSpecificCause(ex).getMessage();
 		if (message != null) {
 			String text = message.toLowerCase(Locale.ROOT);

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.web.servlet.mvc.support;
 
 import java.lang.reflect.Method;
+import java.net.SocketException;
 import java.util.Arrays;
 import java.util.Collections;
 
@@ -42,6 +43,7 @@
 import org.springframework.web.bind.MissingPathVariableException;
 import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.ServletRequestBindingException;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.multipart.support.MissingServletRequestPartException;
@@ -60,6 +62,7 @@
  *
  * @author Arjen Poutsma
  * @author Sebastien Deleuze
+ * @author Yanming Zhou
  */
 class DefaultHandlerExceptionResolverTests {
 
@@ -248,6 +251,24 @@ void handleMaxUploadSizeExceededException() {
 		assertThat(response.getErrorMessage()).isEqualTo("Maximum upload size exceeded");
 	}
 
+	@Test
+	void handleClientDisconnectedException() {
+		SocketException ex = new SocketException("Connection reset");
+		ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex);
+		assertThat(mav).as("No ModelAndView returned").isNotNull();
+	}
+
+	@Test
+	void handleRestClientExceptionHasConnectionResetMessage() {
+		RestClientException ex = new RestClientException("I/O error", new SocketException("Connection reset"));
+		ModelAndView mav = exceptionResolver.resolveException(request, response, null, ex);
+		assertThat(mav).as("ModelAndView is returned").isNull();
+
+		Exception exception = new Exception(ex.getMessage(), ex);
+		mav = exceptionResolver.resolveException(request, response, null, exception);
+		assertThat(mav).as("ModelAndView is returned").isNull();
+	}
+
 	@Test
 	void customModelAndView() {
 		ModelAndView expected = new ModelAndView();