root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Add missing exception name to DisconnectedClientHelper 

Closes gh-31717
This commit is contained in:
rstoyanchev 2023-11-29 14:07:56 +00:00
parent 9ade52dbe2
commit 8ca82120e0
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,7 @@ public class DisconnectedClientHelper {
Set.of("broken pipe", "connection reset by peer"); Set.of("broken pipe", "connection reset by peer");
private static final Set<String> EXCEPTION_TYPE_NAMES = private static final Set<String> EXCEPTION_TYPE_NAMES =
Set.of("ClientAbortException", "EOFException", "EofException"); Set.of("AbortedException", "ClientAbortException", "EOFException", "EofException");
private final Log logger; private final Log logger;
@ -51,28 +50,6 @@ public class DisconnectedClientHelper {
} }
/**
* Whether the given exception indicates the client has gone away.
* Known cases covered:
* <ul>
* <li>ClientAbortException or EOFException for Tomcat
* <li>EofException for Jetty
* <li>IOException "Broken pipe" or "connection reset by peer"
* </ul>
*/
public boolean isClientDisconnectedException(Throwable ex) {
String message = NestedExceptionUtils.getMostSpecificCause(ex).getMessage();
if (message != null) {
String text = message.toLowerCase();
for (String phrase : EXCEPTION_PHRASES) {
if (text.contains(phrase)) {
return true;
}
}
}
return EXCEPTION_TYPE_NAMES.contains(ex.getClass().getSimpleName());
}
/** /**
* Check via {@link #isClientDisconnectedException} if the exception * Check via {@link #isClientDisconnectedException} if the exception
* indicates the remote client disconnected, and if so log a single line * indicates the remote client disconnected, and if so log a single line
@ -93,4 +70,26 @@ public class DisconnectedClientHelper {
return false; return false;
} }
/**
* Whether the given exception indicates the client has gone away.
* Known cases covered:
* <ul>
* <li>ClientAbortException or EOFException for Tomcat
* <li>EofException for Jetty
* <li>IOException "Broken pipe" or "connection reset by peer"
* </ul>
*/
public static boolean isClientDisconnectedException(Throwable ex) {
String message = NestedExceptionUtils.getMostSpecificCause(ex).getMessage();
if (message != null) {
String text = message.toLowerCase();
for (String phrase : EXCEPTION_PHRASES) {
if (text.contains(phrase)) {
return true;
}
}
}
return EXCEPTION_TYPE_NAMES.contains(ex.getClass().getSimpleName());
}
} }