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

Merge branch '2.1.x' into 2.2.x

This commit is contained in:
Phillip Webb 2019-12-13 11:46:25 -08:00
parent 26ff18f37d 8e03982bca
commit 6d372f60d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
View File

@ -190,7 +190,7 @@ public class SslServerCustomizer implements NettyServerCustomizer {
this(KeyManagerFactory.getInstance(algorithm), alias, algorithm); this(KeyManagerFactory.getInstance(algorithm), alias, algorithm);
} }
public ConfigurableAliasKeyManagerFactory(KeyManagerFactory delegate, String alias, String algorithm) { private ConfigurableAliasKeyManagerFactory(KeyManagerFactory delegate, String alias, String algorithm) {
super(new ConfigurableAliasKeyManagerFactorySpi(delegate, alias), delegate.getProvider(), algorithm); super(new ConfigurableAliasKeyManagerFactorySpi(delegate, alias), delegate.getProvider(), algorithm);
} }