From 192d7e5f83aed0c651400f393fd000f15f72fc10 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Thu, 31 May 2012 22:26:24 +0200 Subject: [PATCH 1/1] =?utf8?q?Unn=C3=B6tigen=20Parameter=20in=20CacheContr?= =?utf8?q?ol.decorate()=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Der Parameter ist wohl aus der Zeit übrig geblieben, als die CacheControl- Instanz noch nicht über die Methode CacheControl.init() initialisiert wurde. --- .../de/halbekunst/juplo/cachecontrol/AcceleratorFilter.java | 6 +++--- .../java/de/halbekunst/juplo/cachecontrol/CacheControl.java | 3 +-- .../juplo/cachecontrol/CacheControlInterceptor.java | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) 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 71c799c3..ffafddc7 100644 --- 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 0512de4a..24d27d3c 100644 --- 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 77d0a862..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; @@ -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 -- 2.20.1