Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk

jetty-server/src/test/java/org/eclipse/jetty/server/HttpTrailersTest.java

@@ -143,6 +143,8 @@ public class HttpTrailersTest
         {
             client.setSoTimeout(5000);
 
+            try
+            {
                 String request = "" +
                     "GET / HTTP/1.1\r\n" +
                     "Host: localhost\r\n" +
@@ -159,5 +161,10 @@ public class HttpTrailersTest
                 Assert.assertNotNull(response);
                 Assert.assertEquals(HttpStatus.OK_200, response.getStatus());
             }
+            catch(Exception e)
+            {
+                // May be thrown if write fails and error handling is aborted
+            }
+        }
     }
 }