Skip to content

S
spring-boot
Commit 9fdef15d authored by Dave Syer's avatar Dave Syer
Browse files
Options

Merge branch '1.3.x'

parents 041da3b6 af426d08
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
View file @ 9fdef15d
...@@ -300,11 +300,13 @@ public class UndertowEmbeddedServletContainerFactory ...@@ -300,11 +300,13 @@ public class UndertowEmbeddedServletContainerFactory
KeyManagerFactory keyManagerFactory = KeyManagerFactory KeyManagerFactory keyManagerFactory = KeyManagerFactory
.getInstance(KeyManagerFactory.getDefaultAlgorithm()); .getInstance(KeyManagerFactory.getDefaultAlgorithm());
Ssl ssl = getSsl(); Ssl ssl = getSsl();
String keyPassword = ssl.getKeyPassword(); char[] keyPassword = ssl.getKeyPassword() != null
if (keyPassword == null) { ? ssl.getKeyPassword().toCharArray()
keyPassword = ssl.getKeyStorePassword(); : null;
if (keyPassword == null && ssl.getKeyStorePassword() != null) {
keyPassword = ssl.getKeyStorePassword().toCharArray();
} }
keyManagerFactory.init(keyStore, keyPassword.toCharArray()); keyManagerFactory.init(keyStore, keyPassword);
return keyManagerFactory.getKeyManagers(); return keyManagerFactory.getKeyManagers();
} }
catch (Exception ex) { catch (Exception ex) {
...@@ -351,7 +353,7 @@ public class UndertowEmbeddedServletContainerFactory ...@@ -351,7 +353,7 @@ public class UndertowEmbeddedServletContainerFactory
} }
KeyStore store = KeyStore.getInstance(type); KeyStore store = KeyStore.getInstance(type);
URL url = ResourceUtils.getURL(resource); URL url = ResourceUtils.getURL(resource);
store.load(url.openStream(), password.toCharArray()); store.load(url.openStream(), password == null ? null : password.toCharArray());
return store; return store;
} }
......
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