Improve DisconnectedClientHelper to better guard ClassNotFoundException

quaff · rstoyanchev · commit a784eb0ab4e7 · 2026-01-14T11:03:09.000Z
Before this commit, WebClientException is ignored if RestClientException is not present.

Signed-off-by: Yanming Zhou &lt;zhouyanming@gmail.com&gt;
diff --git a/spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java b/spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java
@@ -36,6 +36,7 @@
  * error stacktrace at TRACE level.
  *
  * @author Rossen Stoyanchev
+ * @author Yanming Zhou
  * @since 6.1
  */
 public class DisconnectedClientHelper {
@@ -50,16 +51,8 @@ public class DisconnectedClientHelper {
 	private static final Set<Class<?>> CLIENT_EXCEPTION_TYPES = new HashSet<>(2);
 
 	static {
-		try {
-			ClassLoader classLoader = DisconnectedClientHelper.class.getClassLoader();
-			CLIENT_EXCEPTION_TYPES.add(ClassUtils.forName(
-					"org.springframework.web.client.RestClientException", classLoader));
-			CLIENT_EXCEPTION_TYPES.add(ClassUtils.forName(
-					"org.springframework.web.reactive.function.client.WebClientException", classLoader));
-		}
-		catch (ClassNotFoundException ex) {
-			// ignore
-		}
+		registerClientExceptionType("org.springframework.web.client.RestClientException");
+		registerClientExceptionType("org.springframework.web.reactive.function.client.WebClientException");
 	}
 
 
@@ -135,4 +128,14 @@ public static boolean isClientDisconnectedException(@Nullable Throwable ex) {
 		return false;
 	}
 
+	private static void registerClientExceptionType(String type) {
+		try {
+			ClassLoader classLoader = DisconnectedClientHelper.class.getClassLoader();
+			CLIENT_EXCEPTION_TYPES.add(ClassUtils.forName(type, classLoader));
+		}
+		catch (ClassNotFoundException ex) {
+			// ignore
+		}
+	}
+
 }
