[RESTEASY-2563: SseBroadcasterImpl.close() puts notifyOnCloseListener…

…s(eventSink) in finally block. (#2396)
resteasy · May 9, 2020 · 177da5a · 177da5a
1 parent c38c226
commit 177da5a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseBroadcasterImpl.java b/resteasy-core/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseBroadcasterImpl.java
@@ -17,6 +17,7 @@
 import javax.ws.rs.sse.SseBroadcaster;
 import javax.ws.rs.sse.SseEventSink;
 
+import org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages;
 import org.jboss.resteasy.resteasy_jaxrs.i18n.Messages;
 
 public class SseBroadcasterImpl implements SseBroadcaster
@@ -62,7 +63,13 @@ public void close()
          //is it necessay to close the subsribed SseEventSink ?
          outputQueue.forEach(eventSink -> {
             eventSink.close();
-            notifyOnCloseListeners(eventSink);
+            try {
+               eventSink.close();
+            } catch (RuntimeException e) {
+               LogMessages.LOGGER.debug(e.getLocalizedMessage());
+            } finally {
+               notifyOnCloseListeners(eventSink);
+            }
          });
       }
       finally