Merge branch '2.1.x'

8bcbcf6c · Brian Clozel · 8528f7c1 · c24f0269 · 8bcbcf6c
Commit 8bcbcf6c authored Feb 08, 2019 by Brian Clozel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

UndertowServletWebServerFactoryTests.java ...bedded/undertow/UndertowServletWebServerFactoryTests.java +2 -1

No files found.
--- 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