Merge branch '2.1.x'

6 years ago · 8bcbcf6c27
parent 8528f7c140 c24f02696f
commit 8bcbcf6c27
1 changed files with 2 additions and 1 deletions
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
@ -214,7 +214,8 @@ public class UndertowServletWebServerFactoryTests
 				.isThrownBy(() -> testRestrictedSSLProtocolsAndCipherSuites(
 						new String[] { "TLSv1.2" },
 						new String[] { "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" }))
-				.isInstanceOfAny(SSLHandshakeException.class, SocketException.class);
+				.isInstanceOfAny(SSLException.class, SSLHandshakeException.class,
+						SocketException.class);
 	}

 	@Test