Merge pull request #1858 from allenxiang/master

#1857 Filter out disabled interceptors from default interceptor list in AnnotationUtil
Atmosphere · Feb 15, 2015 · 577ae00 · 577ae00
2 parents 06940ae + 1c2315e
commit 577ae00
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/annotation/AnnotationUtil.java b/modules/cpr/src/main/java/org/atmosphere/annotation/AnnotationUtil.java
@@ -70,11 +70,13 @@ public static void defaultInterceptors(AtmosphereFramework framework, List<Atmos
     }
 
     public static void interceptors(AtmosphereFramework framework, Class<? extends AtmosphereInterceptor>[] interceptors, List<AtmosphereInterceptor> l) {
-        for (Class i : interceptors) {
-            try {
-                l.add(framework.newClassInstance(AtmosphereInterceptor.class, i));
-            } catch (Throwable e) {
-                logger.warn("", e);
+        for (Class<? extends AtmosphereInterceptor> i : interceptors) {
+            if (!framework.excludedInterceptors().contains(i.getName())){
+                try {
+                    l.add(framework.newClassInstance(AtmosphereInterceptor.class, i));
+                } catch (Throwable e) {
+                    logger.warn("", e);
+                }
             }
         }
     }

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereFramework.java
@@ -1176,7 +1176,7 @@ protected void configureAtmosphereInterceptor(ServletConfig sc) {
                 }
             }
 
-            logger.info("Set {} to disable them.", ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTOR, interceptors);
+            logger.info("Set {} to disable them.", ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTOR);
         }
         initInterceptors();
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
-                logger.info("Set {} to disable them.", ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTOR, interceptors);
+                logger.info("Set {} to disable them.", ApplicationConfig.DISABLE_ATMOSPHEREINTERCEPTOR);
             }
             initInterceptors();
         }
@@ Expand Down @@