From 8f7436f7ac518614b71912301a23b34583c6e506 Mon Sep 17 00:00:00 2001
From: jfarcand <jfarcand@apache.org>
Date: Thu, 5 Dec 2013 11:08:00 -0500
Subject: [PATCH] Fixes #1311

---
 .../atmosphere/cpr/AtmosphereFramework.java   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java
index cef5c0c0497..857d5ff6052 100644
--- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java
+++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java
@@ -214,24 +214,24 @@ public class AtmosphereFramework {
     protected AnnotationProcessor annotationProcessor = null;
 
     protected final Class<? extends AtmosphereInterceptor>[] defaultInterceptors = new Class[]{
-            // Add CORS support
-            CorsInterceptor.class,
-            // Default Interceptor
-            CacheHeadersInterceptor.class,
-            // WebKit & IE Padding
-            PaddingAtmosphereInterceptor.class,
-            // Android 2.3.x streaming support
-            AndroidAtmosphereInterceptor.class,
-            // Add SSE support
-            SSEAtmosphereInterceptor.class,
-            // ADD JSONP support
-            JSONPAtmosphereInterceptor.class,
-            // ADD Tracking ID Handshake
-            JavaScriptProtocol.class,
-            // WebSocket and suspend
-            WebSocketMessageSuspendInterceptor.class,
             // OnDisconnect
             OnDisconnectInterceptor.class,
+            // WebSocket and suspend
+            WebSocketMessageSuspendInterceptor.class,
+            // ADD Tracking ID Handshake
+            JavaScriptProtocol.class,
+            // ADD JSONP support
+            JSONPAtmosphereInterceptor.class,
+            // Add SSE support
+            SSEAtmosphereInterceptor.class,
+            // Android 2.3.x streaming support
+            AndroidAtmosphereInterceptor.class,
+            // WebKit & IE Padding
+            PaddingAtmosphereInterceptor.class,
+            // Default Interceptor
+            CacheHeadersInterceptor.class,
+            // Add CORS support
+            CorsInterceptor.class
     };
 
     /**
@@ -869,7 +869,7 @@ protected void configureAtmosphereInterceptor(ServletConfig sc) {
         s = sc.getInitParameter(ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTOR);
         if (s == null) {
             for (Class<? extends AtmosphereInterceptor> a : defaultInterceptors) {
-                interceptors.addLast(newAInterceptor(a));
+                interceptors.addFirst(newAInterceptor(a));
             }
             logger.info("Set {} to disable them.", ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTOR, interceptors);
         }