431519 Fixed NetworkTrafficListener

1 files changed, 17 insertions, 4 deletions

diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java
index bf84223df1..ca9d7999cb 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java
@@ -44,7 +44,6 @@ import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
 
-@Ignore
 public class NetworkTrafficListenerTest
 {
     private static final byte END_OF_CONTENT = '~';
@@ -114,6 +113,7 @@ public class NetworkTrafficListenerTest
     {
         initConnector(new AbstractHandler()
         {
+            @Override
             public void handle(String uri, Request request, HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws IOException, ServletException
             {
                 request.setHandled(true);
@@ -176,6 +176,7 @@ public class NetworkTrafficListenerTest
         final String responseContent = "response_content";
         initConnector(new AbstractHandler()
         {
+            @Override
             public void handle(String uri, Request request, HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws IOException, ServletException
             {
                 request.setHandled(true);
@@ -191,12 +192,14 @@ public class NetworkTrafficListenerTest
         final CountDownLatch outgoingLatch = new CountDownLatch(2);
         connector.addNetworkTrafficListener(new NetworkTrafficListener.Adapter()
         {
+            @Override
             public void incoming(Socket socket, ByteBuffer bytes)
             {
                 incomingData.set(BufferUtil.toString(bytes,StandardCharsets.UTF_8));
                 incomingLatch.countDown();
             }
 
+            @Override
             public void outgoing(Socket socket, ByteBuffer bytes)
             {
                 outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
@@ -241,6 +244,7 @@ public class NetworkTrafficListenerTest
         final String responseChunk2 = "response_content".substring(responseContent.length() / 2, responseContent.length());
         initConnector(new AbstractHandler()
         {
+            @Override
             public void handle(String uri, Request request, HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws IOException, ServletException
             {
                 request.setHandled(true);
@@ -255,19 +259,22 @@ public class NetworkTrafficListenerTest
         final AtomicReference<String> incomingData = new AtomicReference<>();
         final CountDownLatch incomingLatch = new CountDownLatch(1);
         final AtomicReference<String> outgoingData = new AtomicReference<>("");
-        final CountDownLatch outgoingLatch = new CountDownLatch(4);
+        final CountDownLatch outgoingLatch = new CountDownLatch(1);
         connector.addNetworkTrafficListener(new NetworkTrafficListener.Adapter()
         {
+            @Override
             public void incoming(Socket socket, ByteBuffer bytes)
             {
                 incomingData.set(BufferUtil.toString(bytes,StandardCharsets.UTF_8));
                 incomingLatch.countDown();
             }
 
+            @Override
             public void outgoing(Socket socket, ByteBuffer bytes)
             {
-                outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
-                outgoingLatch.countDown();
+                outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));                
+                if (outgoingData.get().endsWith("\r\n0\r\n\r\n"))
+                    outgoingLatch.countDown();
             }
         });
         int port = connector.getLocalPort();
@@ -311,6 +318,7 @@ public class NetworkTrafficListenerTest
         final String location = "/redirect";
         initConnector(new AbstractHandler()
         {
+            @Override
             public void handle(String uri, Request request, HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws IOException, ServletException
             {
                 request.setHandled(true);
@@ -324,12 +332,14 @@ public class NetworkTrafficListenerTest
         final CountDownLatch outgoingLatch = new CountDownLatch(1);
         connector.addNetworkTrafficListener(new NetworkTrafficListener.Adapter()
         {
+            @Override
             public void incoming(Socket socket, ByteBuffer bytes)
             {
                 incomingData.set(BufferUtil.toString(bytes,StandardCharsets.UTF_8));
                 incomingLatch.countDown();
             }
 
+            @Override
             public void outgoing(Socket socket, ByteBuffer bytes)
             {
                 outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
@@ -375,6 +385,7 @@ public class NetworkTrafficListenerTest
     {
         initConnector(new AbstractHandler()
         {
+            @Override
             public void handle(String uri, Request request, HttpServletRequest servletRequest, HttpServletResponse servletResponse) throws IOException, ServletException
             {
                 // Read and discard the request body to make the test more
@@ -397,11 +408,13 @@ public class NetworkTrafficListenerTest
         final CountDownLatch outgoingLatch = new CountDownLatch(1);
         connector.addNetworkTrafficListener(new NetworkTrafficListener.Adapter()
         {
+            @Override
             public void incoming(Socket socket, ByteBuffer bytes)
             {
                 incomingData.set(incomingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
             }
 
+            @Override
             public void outgoing(Socket socket, ByteBuffer bytes)
             {
                 outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));