Fix for #983

Atmosphere · Mar 27, 2013 · c0214a6 · c0214a6
1 parent b01ff51
commit c0214a6
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/interceptor/OnDisconnectInterceptor.java b/modules/cpr/src/main/java/org/atmosphere/interceptor/OnDisconnectInterceptor.java
@@ -20,9 +20,7 @@
 import org.atmosphere.cpr.AtmosphereInterceptor;
 import org.atmosphere.cpr.AtmosphereRequest;
 import org.atmosphere.cpr.AtmosphereResource;
-import org.atmosphere.cpr.AtmosphereResourceEvent;
 import org.atmosphere.cpr.AtmosphereResourceEventImpl;
-import org.atmosphere.cpr.AtmosphereResourceEventListenerAdapter;
 import org.atmosphere.cpr.AtmosphereResourceFactory;
 import org.atmosphere.cpr.AtmosphereResourceImpl;
 import org.atmosphere.cpr.HeaderConfig;
@@ -56,9 +54,13 @@ public Action inspect(final AtmosphereResource r) {
             if (ss != null) {
                 ss.notifyListeners(new AtmosphereResourceEventImpl(AtmosphereResourceImpl.class.cast(r), true, false));
                 try {
-                    ss.getRequest().setAttribute(AtmosphereResourceImpl.PRE_SUSPEND, "");
-                    AtmosphereResourceImpl.class.cast(ss).cancel();
-                } catch (IOException e) {
+                    try {
+                        // https://github.com/Atmosphere/atmosphere/issues/983
+                        ss.getRequest().setAttribute(AtmosphereResourceImpl.PRE_SUSPEND, "");
+                    } finally {
+                        AtmosphereResourceImpl.class.cast(ss).cancel();
+                    }
+                } catch (Throwable e) {
                     logger.trace("", e);
                 }
             }
@@ -71,7 +73,7 @@ public Action inspect(final AtmosphereResource r) {
     public void postInspect(AtmosphereResource r) {
     }
 
-    public String toString(){
+    public String toString() {
         return "Browser disconnection detection";
     }
 }