Fixes #1503

Atmosphere · Mar 11, 2014 · 6b17c31 · 6b17c31
1 parent c577a2a
commit 6b17c31
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/interceptor/HeartbeatInterceptor.java b/modules/cpr/src/main/java/org/atmosphere/interceptor/HeartbeatInterceptor.java
@@ -133,9 +133,13 @@ public void postPayload(final AtmosphereResponse response, byte[] data, int offs
     }
 
     void cancelF(AtmosphereRequest request) {
-        Future<?> f = (Future<?>) request.getAttribute(HEARTBEAT_FUTURE);
-        if (f != null) f.cancel(false);
-        request.removeAttribute(HEARTBEAT_FUTURE);
+        try {
+            Future<?> f = (Future<?>) request.getAttribute(HEARTBEAT_FUTURE);
+            if (f != null) f.cancel(false);
+            request.removeAttribute(HEARTBEAT_FUTURE);
+        } catch (Exception ex) {
+            logger.trace("", ex);
+        }
     }
 
     public HeartbeatInterceptor clock(final AtmosphereResource r, final AtmosphereRequest request, final AtmosphereResponse response) {