Merge branch '2.0.x'

2018-08-27 18:20:42 +02:00
parent e1ebbcd720 352a6671e8
commit 20c8f61473
1 changed files with 1 additions and 4 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/SslBuilderCustomizer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/SslBuilderCustomizer.java
@@ -84,10 +84,7 @@ class SslBuilderCustomizer implements UndertowBuilderCustomizer {
 						Sequence.of(this.ssl.getCiphers()));
 			}
 		}
-		catch (NoSuchAlgorithmException ex) {
-			throw new IllegalStateException(ex);
-		}
-		catch (KeyManagementException ex) {
+		catch (NoSuchAlgorithmException | KeyManagementException ex) {
 			throw new IllegalStateException(ex);
 		}
 	}