X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cachecontrol%2Fsrc%2Fmain%2Fjava%2Fde%2Fhalbekunst%2Fjuplo%2Fcachecontrol%2FCacheControlInterceptor.java;h=c32183f6165f5821ae8085f6bba0c3fe94eecffe;hb=1d395c6002486d485bde0d5dc713886d70bd3f8a;hp=254187f7715cb5a17521e68e38bb380b4eadf4e9;hpb=2ae9a9d1011d3cb6cb0a172b629cb390c4fdf0ea;p=percentcodec

diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
index 254187f7..c32183f6 100644
--- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
@@ -42,7 +42,7 @@ public class CacheControlInterceptor implements HandlerInterceptor {
     cacheControl.init(handler, wrapper);
 
     if (cacheable.eager()) {
-      return cacheControl.decorate(request, response, handler);
+      return cacheControl.decorate(request, response);
     }
     else {
       return true;
@@ -57,7 +57,12 @@ public class CacheControlInterceptor implements HandlerInterceptor {
       ModelAndView modelAndView
       ) throws Exception
   {
-    cacheControl.decorate(request, response, handler);
+    /**
+     * Dekoration nur dann anstossen, wenn sie nicht bereits von dem
+     * AcceleratorFilter ausgelöst wird.
+     */
+    if (request.getAttribute(AcceleratorFilter.RESPONSE_WRAPPER) == null)
+      cacheControl.decorate(request, response);
   }
 
   @Override