Fixes #1369

Atmosphere · Nov 11, 2013 · 3bb826f · 3bb826f
1 parent 6cd13b2
commit 3bb826f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/handler/OnMessage.java b/modules/cpr/src/main/java/org/atmosphere/handler/OnMessage.java
@@ -53,19 +53,19 @@ public final void onStateChange(AtmosphereResourceEvent event) throws IOExceptio
         AtmosphereResponse response = ((AtmosphereResourceImpl) event.getResource()).getResponse(false);
 
         logger.trace("{} with event {}", event.getResource().uuid(), event);
-        if (event.getMessage() != null && List.class.isAssignableFrom(event.getMessage().getClass())) {
+        if (event.isCancelled() || event.isClosedByApplication() || event.isClosedByClient()) {
+            onDisconnect(response);
+        } else if (event.getMessage() != null && List.class.isAssignableFrom(event.getMessage().getClass())) {
             List<T> messages = List.class.cast(event.getMessage());
             for (T t : messages) {
                 onMessage(response, t);
             }
-        } else if (event.isSuspended()) {
-            onMessage(response, (T) event.getMessage());
         } else if (event.isResuming()) {
             onResume(response);
         } else if (event.isResumedOnTimeout()) {
             onTimeout(response);
-        } else if (event.isCancelled()) {
-            onDisconnect(response);
+        } else if (event.isSuspended()) {
+            onMessage(response, (T) event.getMessage());
         }
         postStateChange(event);
     }