Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Throw EmbeddedContainerExceptions from Undertow

Browse Source 
Wrap Undertow start errors in EmbeddedContainerException.

Fixes gh-4205
This commit is contained in:
Phillip Webb
2015-10-15 17:49:40 -07:00
parent 03d54fa1d0
commit 5a84c02b08
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java
View File

@@ -99,27 +99,17 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
@Override
public synchronized void start() throws EmbeddedServletContainerException {
if (!this.autoStart) {
return;
}
if (this.undertow == null) {
this.undertow = createUndertowServer();
}
this.undertow.start();
this.started = true;
UndertowEmbeddedServletContainer.logger
.info("Undertow started on port(s) " + getPortsDescription());
}
private Undertow createUndertowServer() {
try {
HttpHandler httpHandler = this.manager.start();
httpHandler = getContextHandler(httpHandler);
if (this.useForwardHeaders) {
httpHandler = Handlers.proxyPeerAddress(httpHandler);
if (!this.autoStart) {
return;
}
this.builder.setHandler(httpHandler);
return this.builder.build();
if (this.undertow == null) {
this.undertow = createUndertowServer();
}
this.undertow.start();
this.started = true;
UndertowEmbeddedServletContainer.logger
.info("Undertow started on port(s) " + getPortsDescription());
}
catch (ServletException ex) {
throw new EmbeddedServletContainerException(
@@ -127,6 +117,16 @@ public class UndertowEmbeddedServletContainer implements EmbeddedServletContaine
}
}
private Undertow createUndertowServer() throws ServletException {
HttpHandler httpHandler = this.manager.start();
httpHandler = getContextHandler(httpHandler);
if (this.useForwardHeaders) {
httpHandler = Handlers.proxyPeerAddress(httpHandler);
}
this.builder.setHandler(httpHandler);
return this.builder.build();
}
private HttpHandler getContextHandler(HttpHandler httpHandler) {
HttpHandler contextHandler = configurationCompressionIfNecessary(httpHandler);
if (StringUtils.isEmpty(this.contextPath)) {