Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e3e28c53
Commit
e3e28c53
authored
Oct 22, 2015
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4265 from izeye/patch-45
* pr/4265: Fix error messages
parents
84728c44
a1e210f5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
TomcatEmbeddedServletContainerFactory.java
...mbedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+2
-2
No files found.
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View file @
e3e28c53
...
...
@@ -330,7 +330,7 @@ public class TomcatEmbeddedServletContainerFactory
}
catch
(
FileNotFoundException
ex
)
{
throw
new
EmbeddedServletContainerException
(
"Could load key store: "
+
ex
.
getMessage
(),
ex
);
"Could
not
load key store: "
+
ex
.
getMessage
(),
ex
);
}
if
(
ssl
.
getKeyStoreType
()
!=
null
)
{
protocol
.
setKeystoreType
(
ssl
.
getKeyStoreType
());
...
...
@@ -348,7 +348,7 @@ public class TomcatEmbeddedServletContainerFactory
}
catch
(
FileNotFoundException
ex
)
{
throw
new
EmbeddedServletContainerException
(
"Could load trust store: "
+
ex
.
getMessage
(),
ex
);
"Could
not
load trust store: "
+
ex
.
getMessage
(),
ex
);
}
}
protocol
.
setTruststorePass
(
ssl
.
getTrustStorePassword
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment