Browse Source

isDisconnectedClientException protected for null

Closes gh-34533
pull/34656/head
rstoyanchev 10 months ago
parent
commit
09ae080b99
  1. 7
      spring-web/src/main/java/org/springframework/web/util/DisconnectedClientHelper.java
  2. 5
      spring-web/src/test/java/org/springframework/web/util/DisconnectedClientHelperTests.java

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

@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.NestedExceptionUtils;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
@ -100,7 +101,11 @@ public class DisconnectedClientHelper { @@ -100,7 +101,11 @@ public class DisconnectedClientHelper {
* <li>IOException "Broken pipe" or "connection reset by peer"
* </ul>
*/
public static boolean isClientDisconnectedException(Throwable ex) {
public static boolean isClientDisconnectedException(@Nullable Throwable ex) {
if (ex == null) {
return false;
}
Throwable currentEx = ex;
Throwable lastEx = null;
while (currentEx != null && currentEx != lastEx) {

5
spring-web/src/test/java/org/springframework/web/util/DisconnectedClientHelperTests.java

@ -90,4 +90,9 @@ public class DisconnectedClientHelperTests { @@ -90,4 +90,9 @@ public class DisconnectedClientHelperTests {
assertThat(DisconnectedClientHelper.isClientDisconnectedException(ex)).isFalse();
}
@Test // gh-34533
void nullException() {
assertThat(DisconnectedClientHelper.isClientDisconnectedException(null)).isFalse();
}
}

Loading…
Cancel
Save