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

Formatting

This commit is contained in:
Phillip Webb 2016-07-13 10:44:37 -07:00
parent af426d0856
commit fd6c0029dc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,17 +294,14 @@ public class UndertowEmbeddedServletContainerFactory
} }
KeyStore keyStore = KeyStore.getInstance(keyStoreType); KeyStore keyStore = KeyStore.getInstance(keyStoreType);
URL url = ResourceUtils.getURL(ssl.getKeyStore()); URL url = ResourceUtils.getURL(ssl.getKeyStore());
char[] keyStorePassword = ssl.getKeyStorePassword() != null char[] keyStorePassword = (ssl.getKeyStorePassword() != null
? ssl.getKeyStorePassword().toCharArray() ? ssl.getKeyStorePassword().toCharArray() : null);
: null;
keyStore.load(url.openStream(), keyStorePassword); keyStore.load(url.openStream(), keyStorePassword);
// Get key manager to provide client credentials. // Get key manager to provide client credentials.
KeyManagerFactory keyManagerFactory = KeyManagerFactory KeyManagerFactory keyManagerFactory = KeyManagerFactory
.getInstance(KeyManagerFactory.getDefaultAlgorithm()); .getInstance(KeyManagerFactory.getDefaultAlgorithm());
char[] keyPassword = ssl.getKeyPassword() != null char[] keyPassword = (ssl.getKeyPassword() != null
? ssl.getKeyPassword().toCharArray() ? ssl.getKeyPassword().toCharArray() : keyStorePassword);
: keyStorePassword;
keyManagerFactory.init(keyStore, keyPassword); keyManagerFactory.init(keyStore, keyPassword);
return keyManagerFactory.getKeyManagers(); return keyManagerFactory.getKeyManagers();
} }