WebSocket - quick fix to prevent jenkins test hang

jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/EchoClientSocket.java

@@ -51,7 +51,11 @@ public class EchoClientSocket extends TrackingSocket
     @OnError
     public void onError(Throwable t)
     {
-        addError(t);
+        if(t == null) {
+            addError(new NullPointerException("Throwable should not be null"));
+        } else {
+            addError(t);
+        }
     }
 
     @OnOpen

jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/EchoTest.java

@@ -243,7 +243,7 @@ public class EchoTest
         System.err.println(testcase);
     }
 
-    @Test
+    @Test(timeout=1000)
     public void testEcho() throws Exception
     {
         EchoClientSocket socket = new EchoClientSocket();