GG-14930 Upgraded Jetty dependency to 9.4.18

(cherry picked from commit 8e63078)
gridgain · Jun 10, 2019 · 7883609 · 7883609
1 parent 7043f6c
commit 7883609
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...rg/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/...rg/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
@@ -18,6 +18,7 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.BindException;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.URL;
@@ -30,6 +31,7 @@
 import org.apache.ignite.internal.processors.rest.protocols.GridRestProtocolAdapter;
 import org.apache.ignite.internal.util.typedef.C1;
 import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.IgniteSpiException;
@@ -223,14 +225,6 @@ private boolean startJetty() throws IgniteCheckedException {
 
             return  false;
         }
-        catch (SocketException ignore) {
-            if (log.isDebugEnabled())
-                log.debug("Failed to bind HTTP server to configured port.");
-
-            stopJetty();
-
-            return false;
-        }
         catch (MultiException e) {
             if (log.isDebugEnabled())
                 log.debug("Caught multi exception: " + e);
@@ -247,7 +241,15 @@ private boolean startJetty() throws IgniteCheckedException {
             return false;
         }
         catch (Exception e) {
-            throw new IgniteCheckedException("Failed to start Jetty HTTP server.", e);
+            if (X.hasCause(e, BindException.class)) {
+                if (log.isDebugEnabled())
+                    log.debug("Failed to bind HTTP server to configured port.");
+
+                stopJetty();
+
+                return false;
+            } else
+                throw new IgniteCheckedException("Failed to start Jetty HTTP server.", e);
         }
     }
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -83,7 +83,7 @@
         <javax.cache.version>1.0.0</javax.cache.version>
         <jboss.rmi.version>1.0.6.Final</jboss.rmi.version>
         <jetbrains.annotations.version>16.0.3</jetbrains.annotations.version>
-        <jetty.version>9.4.11.v20180605</jetty.version>
+        <jetty.version>9.4.18.v20190429</jetty.version>
         <jmh.version>1.13</jmh.version>
         <jms.spec.version>1.1.1</jms.spec.version>
         <jna.version>4.5.2</jna.version>