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

Merge branch '1.3.x'

This commit is contained in:
Phillip Webb 2016-07-13 10:48:02 -07:00
parent f84f31b47d fd6c0029dc
commit d9e8676f77
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
View File

@ -300,9 +300,8 @@ public class UndertowEmbeddedServletContainerFactory
KeyManagerFactory keyManagerFactory = KeyManagerFactory KeyManagerFactory keyManagerFactory = KeyManagerFactory
.getInstance(KeyManagerFactory.getDefaultAlgorithm()); .getInstance(KeyManagerFactory.getDefaultAlgorithm());
Ssl ssl = getSsl(); Ssl ssl = getSsl();
char[] keyPassword = ssl.getKeyPassword() != null char[] keyPassword = (ssl.getKeyPassword() != null
? ssl.getKeyPassword().toCharArray() ? ssl.getKeyPassword().toCharArray() : null);
: null;
if (keyPassword == null && ssl.getKeyStorePassword() != null) { if (keyPassword == null && ssl.getKeyStorePassword() != null) {
keyPassword = ssl.getKeyStorePassword().toCharArray(); keyPassword = ssl.getKeyStorePassword().toCharArray();
} }