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

Merge pull request #4265 from izeye/patch-45 

* pr/4265:
  Fix error messages
This commit is contained in:
Stephane Nicoll 2015-10-22 09:27:05 +02:00
parent 84728c44c3 a1e210f578
commit e3e28c538f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@ -330,7 +330,7 @@ public class TomcatEmbeddedServletContainerFactory
} }
catch (FileNotFoundException ex) { catch (FileNotFoundException ex) {
throw new EmbeddedServletContainerException( throw new EmbeddedServletContainerException(
"Could load key store: " + ex.getMessage(), ex); "Could not load key store: " + ex.getMessage(), ex);
} }
if (ssl.getKeyStoreType() != null) { if (ssl.getKeyStoreType() != null) {
protocol.setKeystoreType(ssl.getKeyStoreType()); protocol.setKeystoreType(ssl.getKeyStoreType());
@ -348,7 +348,7 @@ public class TomcatEmbeddedServletContainerFactory
} }
catch (FileNotFoundException ex) { catch (FileNotFoundException ex) {
throw new EmbeddedServletContainerException( throw new EmbeddedServletContainerException(
"Could load trust store: " + ex.getMessage(), ex); "Could not load trust store: " + ex.getMessage(), ex);
} }
} }
protocol.setTruststorePass(ssl.getTrustStorePassword()); protocol.setTruststorePass(ssl.getTrustStorePassword());