Commit e20fcf0e authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x'

parents 6c61cbf5 dee8750a
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 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);
} }
} }
......
...@@ -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);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment