Merged branch 'master' into 'jetty-9.1'.

2 files changed, 7 insertions, 6 deletions

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java
index a569b1a14a..0170d3e204 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java
@@ -67,10 +67,8 @@ public class HttpTester
     {
         Response r=new Response();
         HttpParser parser =new HttpParser(r);
-        if (parser.parseNext(response))
-            return r;
-        else
-            return null;
+        parser.parseNext(response);
+        return r;
     }
 
 
@@ -93,7 +91,7 @@ public class HttpTester
         {
             _version=version;
         }
-        
+
         public void setContent(byte[] bytes)
         {
             try
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
index 392d4e5138..047f5992c6 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
@@ -19,6 +19,7 @@
 package org.eclipse.jetty.servlets;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -1066,8 +1067,10 @@ public class DoSFilter implements Filter
      * A RateTracker is associated with a connection, and stores request rate
      * data.
      */
-    class RateTracker extends Timeout.Task implements HttpSessionBindingListener, HttpSessionActivationListener
+    class RateTracker extends Timeout.Task implements HttpSessionBindingListener, HttpSessionActivationListener, Serializable
     {
+        private static final long serialVersionUID = 3534663738034577872L;
+
         transient protected final String _id;
         transient protected final int _type;
         transient protected final long[] _timestamps;