More legacy code for #1885

Atmosphere · Mar 17, 2015 · cf959bd · cf959bd
1 parent 91a9ee9
commit cf959bd
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereResourceImpl.java
@@ -841,10 +841,15 @@ private void unregister() {
 
     public void _destroy() {
         try {
+            // TODO: Remove with Atmosphere 3
+            // Legacy https://github.com/Atmosphere/atmosphere/issues/1885
+            Broadcaster b = getBroadcaster();
             if (!isCancelled.get()) {
                 removeFromAllBroadcasters();
             }
             broadcasters.clear();
+
+            broadcasters.add(b);
             unregister();
             removeEventListeners();
         } catch (Throwable t) {