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
e20fcf0e
Commit
e20fcf0e
authored
Apr 03, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.5.x'
parents
6c61cbf5
dee8750a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
JettyWebServer.java
...ringframework/boot/web/embedded/jetty/JettyWebServer.java
+3
-1
TomcatWebServer.java
...ngframework/boot/web/embedded/tomcat/TomcatWebServer.java
+1
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyWebServer.java
View file @
e20fcf0e
/*
/*
* Copyright 2012-201
7
the original author or authors.
* Copyright 2012-201
8
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -159,9 +159,11 @@ public class JettyWebServer implements WebServer {
...
@@ -159,9 +159,11 @@ public class JettyWebServer implements WebServer {
+
" with context path '"
+
getContextPath
()
+
"'"
);
+
" with context path '"
+
getContextPath
()
+
"'"
);
}
}
catch
(
WebServerException
ex
)
{
catch
(
WebServerException
ex
)
{
stopSilently
();
throw
ex
;
throw
ex
;
}
}
catch
(
Exception
ex
)
{
catch
(
Exception
ex
)
{
stopSilently
();
throw
new
WebServerException
(
"Unable to start embedded Jetty server"
,
ex
);
throw
new
WebServerException
(
"Unable to start embedded Jetty server"
,
ex
);
}
}
}
}
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatWebServer.java
View file @
e20fcf0e
...
@@ -122,6 +122,7 @@ public class TomcatWebServer implements WebServer {
...
@@ -122,6 +122,7 @@ public class TomcatWebServer implements WebServer {
startDaemonAwaitThread
();
startDaemonAwaitThread
();
}
}
catch
(
Exception
ex
)
{
catch
(
Exception
ex
)
{
stopSilently
();
throw
new
WebServerException
(
"Unable to start embedded Tomcat"
,
ex
);
throw
new
WebServerException
(
"Unable to start embedded Tomcat"
,
ex
);
}
}
}
}
...
...
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