Unnötigen Parameter in CacheControl.decorate() entfernt

Der Parameter ist wohl aus der Zeit übrig geblieben, als die CacheControl-
Instanz noch nicht über die Methode CacheControl.init() initialisiert
wurde.

diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java
index 71c799c3185466ad7b856e6bbaf1c1597fa273d1..ffafddc7d382f2b6fc26b64ba81a4535cb007dae 100644 (file)
--- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java
@@ -651,7 +651,7 @@ public class AcceleratorFilter implements Filter {
           out().write(buffer);
           pos = 0;
           committed = true;
-          cacheControl.decorate(request, response, this);
+          cacheControl.decorate(request, response);
         }
         buffer[pos++] = (byte) i;
         size++;
@@ -663,7 +663,7 @@ public class AcceleratorFilter implements Filter {
           return;
 
         committed = true;
-        cacheControl.decorate(request, response, this);
+        cacheControl.decorate(request, response);
         out().write(buffer, 0, pos);
         out().flush();
         pos = 0;
@@ -674,7 +674,7 @@ public class AcceleratorFilter implements Filter {
         if (size == 0) {
           committed = true;
           zipped = false;
-          cacheControl.decorate(request, response, this);
+          cacheControl.decorate(request, response);
           sos.close();
         }
         else {

diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
index 0512de4a0a84cd7301e78c2c015dc6ab21e7580b..24d27d3c31cdde6bdbc2447837b0dc8f3a42b388 100644 (file)
--- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
@@ -45,8 +45,7 @@ public class CacheControl {
 
   public boolean decorate(
       HttpServletRequest request,
-      HttpServletResponse response,
-      Object handler
+      HttpServletResponse response
       )
   {
     try {

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 77d0a862c936ba6d616a480c69c2ff949bb5ee48..c32183f6165f5821ae8085f6bba0c3fe94eecffe 100644 (file)
--- 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;
@@ -62,7 +62,7 @@ public class CacheControlInterceptor implements HandlerInterceptor {
      * AcceleratorFilter ausgelöst wird.
      */
     if (request.getAttribute(AcceleratorFilter.RESPONSE_WRAPPER) == null)
-      cacheControl.decorate(request, response, handler);
+      cacheControl.decorate(request, response);
   }
 
   @Override