Fixes #1311

Atmosphere · Dec 5, 2013 · 8f7436f · 8f7436f
1 parent 8d10a4b
commit 8f7436f
Showing 1 changed file with 17 additions and 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
@@ -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);
         }