Atmosphere#2073 AtmosphereInterceptor.postInspect() is not called in …

…case of a handler thrown exception (cherry picked from commit 3133c59)
Cosium · Jan 11, 2016 · 06aae80 · 06aae80
1 parent eec4b5b
commit 06aae80
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AsynchronousProcessor.java
@@ -173,12 +173,12 @@ Action action(AtmosphereRequest req, AtmosphereResponse res) throws IOException,
 
         // handler interceptor lists
         LinkedList<AtmosphereInterceptor> invokedInterceptors = handlerWrapper.interceptors;
-        Action a = invokeInterceptors(invokedInterceptors, resource, tracing);
-        if (a.type() != Action.TYPE.CONTINUE && a.type() != Action.TYPE.SKIP_ATMOSPHEREHANDLER) {
-            return a;
-        }
 
         try {
+            Action a = invokeInterceptors(invokedInterceptors, resource, tracing);
+            if (a.type() != Action.TYPE.CONTINUE && a.type() != Action.TYPE.SKIP_ATMOSPHEREHANDLER) {
+                return a;
+            }
             // Remap occured.
             if (req.getAttribute(FrameworkConfig.NEW_MAPPING) != null) {
                 req.removeAttribute(FrameworkConfig.NEW_MAPPING);