WebSocket - making flush loop and callback notify more consistent

jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/WriteBytesProvider.java

@@ -209,39 +209,37 @@ public class WriteBytesProvider implements Callback
 
     public void failAll(Throwable t)
     {
-        boolean notified = false;
+        // Collect entries for callback
+        List<FrameEntry> callbacks = new ArrayList<>();
 
+        synchronized (this)
+        {
             // fail active (if set)
             if (active != null)
             {
                 FrameEntry entry = active;
                 active = null;
-            entry.notifyFailure(t);
+                callbacks.add(entry);
-            notified = true;
             }
 
-        failure = t;
+            callbacks.addAll(past);
+            callbacks.addAll(queue);
 
-        // fail past
+            past.clear();
-        while (!past.isEmpty())
+            queue.clear();
-        {
-            FrameEntry entry = past.pop();
-            entry.notifyFailure(t);
-            notified = true;
         }
 
-        // fail others
-        while (!queue.isEmpty())
-        {
-            FrameEntry entry = queue.pop();
-            entry.notifyFailure(t);
-            notified = true;
-        }
-
-        if (notified)
-        {
         // notify flush callback
+        if (!callbacks.isEmpty())
+        {
+            // TODO: always notify instead?
             flushCallback.failed(t);
+
+            // notify entry callbacks
+            for (FrameEntry entry : callbacks)
+            {
+                entry.notifyFailure(t);
+            }
         }
     }
 
@@ -362,23 +360,32 @@ public class WriteBytesProvider implements Callback
      */
     @Override
     public void succeeded()
+    {
+        // Collect entries for callback
+        List<FrameEntry> callbacks = new ArrayList<>();
+
+        synchronized (this)
         {
             if ((active != null) && (active.frame.remaining() <= 0))
             {
                 // All done with active FrameEntry
                 FrameEntry entry = active;
                 active = null;
-            entry.notifySucceeded();
+                callbacks.add(entry);
             }
 
-        while (!past.isEmpty())
+            callbacks.addAll(past);
-        {
+            past.clear();
-            FrameEntry entry = past.pop();
-            entry.notifySucceeded();
         }
 
         // notify flush callback
         flushCallback.succeeded();
+
+        // notify entry callbacks outside of synchronize
+        for (FrameEntry entry : callbacks)
+        {
+            entry.notifySucceeded();
+        }
     }
 
     @Override