Merge pull request #7689 from vespa-engine/bjorncs/jetty

Bjorncs/jetty

2 files changed, 5 insertions, 3 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 3944fc44cd6..fe37c08a947 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -466,7 +466,7 @@
         <guava.version>18.0</guava.version>
         <guice.version>3.0</guice.version>
         <jaxb.version>2.3.0</jaxb.version>
-        <jetty.version>9.4.12.v20180830</jetty.version>
+        <jetty.version>9.4.14.v20181114</jetty.version>
         <slf4j.version>1.7.5</slf4j.version>
 
         <!-- These must be kept in sync with version used by current jersey2.version. -->
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index 8074af7f64f..40be93f2111 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
@@ -41,6 +41,7 @@ import org.osgi.framework.ServiceReference;
 import javax.management.remote.JMXServiceURL;
 import javax.servlet.DispatcherType;
 
+import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.net.BindException;
 import java.net.MalformedURLException;
@@ -302,9 +303,10 @@ public class JettyHttpServer extends AbstractServerProvider {
     public void start() {
         try {
             server.start();
-        } catch (final BindException e) {
-            throw new RuntimeException("Failed to start server due to BindExecption. ListenPorts = " + listenedPorts.toString(), e);
         } catch (final Exception e) {
+            if (e instanceof IOException && e.getCause() instanceof BindException) {
+                throw new RuntimeException("Failed to start server due to BindExecption. ListenPorts = " + listenedPorts.toString(), e.getCause());
+            }
             throw new RuntimeException("Failed to start server.", e);
         }
     }