Skip to content

S
spring-boot
Commit d9e8676f authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '1.3.x'

parents f84f31b4 fd6c0029
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
View file @ d9e8676f
...@@ -300,9 +300,8 @@ public class UndertowEmbeddedServletContainerFactory ...@@ -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();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment