Upgraded Jetty dependency from 9.4.9 to 9.4.11

.classpath

@@ -43,20 +43,20 @@
 	<classpathentry kind="lib" path="lib/commons-io-2.6.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
 	<classpathentry kind="lib" path="lib/chardet.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-client-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-continuation-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-deploy-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-http-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-io-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-jmx-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-proxy-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-security-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-server-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlet-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlets-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-util-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-webapp-9.4.9.v20180320.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-xml-9.4.9.v20180320.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-client-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-continuation-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-deploy-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-http-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-io-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-jmx-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-proxy-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-security-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-server-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlet-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlets-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-util-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-webapp-9.4.11.v20180605.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-xml-9.4.11.v20180605.jar"/>
 	<classpathentry kind="lib" path="lib/httpclient-4.5.5.jar"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.5.5.jar"/>
 	<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>

build.xml

@@ -202,20 +202,20 @@
         <pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
     	<pathelement location="${lib}/jcifs-1.3.17.jar" />
     	<pathelement location="${lib}/jcl-over-slf4j-1.7.25.jar" />
-        <pathelement location="${lib}/jetty-client-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-continuation-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-deploy-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-http-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-io-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-jmx-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-proxy-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-security-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-server-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-servlet-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-servlets-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-util-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-webapp-9.4.9.v20180320.jar" />
-        <pathelement location="${lib}/jetty-xml-9.4.9.v20180320.jar" />
+        <pathelement location="${lib}/jetty-client-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-continuation-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-deploy-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-http-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-io-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-jmx-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-proxy-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-security-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-server-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-servlet-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-servlets-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-util-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-webapp-9.4.11.v20180605.jar" />
+        <pathelement location="${lib}/jetty-xml-9.4.11.v20180605.jar" />
     	<pathelement location="${lib}/jsch-0.1.54.jar" />
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsonic-1.3.10.jar" />

pom.xml

@@ -36,7 +36,7 @@
         <!-- the Solr version used in dependency section for all related dependencies -->
         <solr.version>6.6.3</solr.version> 
         <!-- the Jetty version used in dependency section for all related dependencies -->
-        <jetty.version>9.4.9.v20180320</jetty.version>
+        <jetty.version>9.4.11.v20180605</jetty.version>
                 
         <!-- properties used for filtering yacyBuildProperties.java -->       
         <REPL_DATE>${DSTAMP}</REPL_DATE>

source/net/yacy/http/servlets/YaCyDefaultServlet.java

@@ -537,7 +537,7 @@ public class YaCyDefaultServlet extends HttpServlet  {
             }
         } else {
             // Parse the satisfiable ranges
-            List<?> ranges = InclusiveByteRange.satisfiableRanges(reqRanges, content_length);
+            final List<InclusiveByteRange> ranges = InclusiveByteRange.satisfiableRanges(reqRanges, content_length);
 
             //  if there are no satisfiable ranges, send 416 response
             if (ranges == null || ranges.isEmpty()) {
@@ -553,14 +553,13 @@ public class YaCyDefaultServlet extends HttpServlet  {
             //  if there is only a single valid range (must be satisfiable
             //  since were here now), send that range with a 216 response
             if (ranges.size() == 1) {
-                InclusiveByteRange singleSatisfiableRange =
-                        (InclusiveByteRange) ranges.get(0);
-                long singleLength = singleSatisfiableRange.getSize(content_length);
+                final InclusiveByteRange singleSatisfiableRange = ranges.iterator().next();
+                long singleLength = singleSatisfiableRange.getSize();
                 writeHeaders(response, resource, singleLength);
                 response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
                 response.setHeader(HttpHeader.CONTENT_RANGE.asString(),
                         singleSatisfiableRange.toHeaderRangeString(content_length));
-                resource.writeTo(out, singleSatisfiableRange.getFirst(content_length), singleLength);
+                resource.writeTo(out, singleSatisfiableRange.getFirst(), singleLength);
                 out.close();
                 return;
             }
@@ -595,7 +594,7 @@ public class YaCyDefaultServlet extends HttpServlet  {
             int length = 0;
             String[] header = new String[ranges.size()];
             for (int i = 0; i < ranges.size(); i++) {
-                InclusiveByteRange ibr = (InclusiveByteRange) ranges.get(i);
+                InclusiveByteRange ibr = ranges.get(i);
                 header[i] = ibr.toHeaderRangeString(content_length);
                 length +=
                         ((i > 0) ? 2 : 0)
@@ -603,17 +602,17 @@ public class YaCyDefaultServlet extends HttpServlet  {
                         + (mimetype == null ? 0 : HeaderFramework.CONTENT_TYPE.length() + 2 + mimetype.length()) + 2
                         + HeaderFramework.CONTENT_RANGE.length() + 2 + header[i].length() + 2
                         + 2
-                        + (ibr.getLast(content_length) - ibr.getFirst(content_length)) + 1;
+                        + (ibr.getLast() - ibr.getFirst()) + 1;
             }
             length += 2 + 2 + multi.getBoundary().length() + 2 + 2;
             response.setContentLength(length);
 
             for (int i = 0; i < ranges.size(); i++) {
-                InclusiveByteRange ibr = (InclusiveByteRange) ranges.get(i);
+                InclusiveByteRange ibr = ranges.get(i);
                 multi.startPart(mimetype, new String[]{HeaderFramework.CONTENT_RANGE + ": " + header[i]});
 
-                long start = ibr.getFirst(content_length);
-                long size = ibr.getSize(content_length);
+                long start = ibr.getFirst();
+                long size = ibr.getSize();
                 if (in != null) {
                     // Handle non cached resource
                     if (start < pos) {