projects
/
percentcodec
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Statische HTML-Datei zu den Test-Beispielen hinzugefügt
[percentcodec]
/
cachecontrol
/
src
/
main
/
java
/
de
/
halbekunst
/
juplo
/
cachecontrol
/
CacheControlInterceptor.java
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
fe51187
..
c32183f
100644
(file)
--- a/
cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
+++ b/
cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
@@
-1,5
+1,6
@@
package de.halbekunst.juplo.cachecontrol;
package de.halbekunst.juplo.cachecontrol;
+import de.halbekunst.juplo.cachecontrol.AcceleratorFilter.AccelerationWrapper;
import de.halbekunst.juplo.cachecontrol.annotations.Cacheable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import de.halbekunst.juplo.cachecontrol.annotations.Cacheable;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@
-33,11
+34,15
@@
public class CacheControlInterceptor implements HandlerInterceptor {
return true;
}
return true;
}
+ AccelerationWrapper wrapper = (AccelerationWrapper)request.getAttribute(AcceleratorFilter.RESPONSE_WRAPPER);
+ if (wrapper != null)
+ wrapper.supressGuessing();
+
/** CacheControll initialisieren (Handler nach annotierte Methoden scannen etc.) */
/** CacheControll initialisieren (Handler nach annotierte Methoden scannen etc.) */
- cacheControl.init(handler);
+ cacheControl.init(handler
, wrapper
);
if (cacheable.eager()) {
if (cacheable.eager()) {
- return cacheControl.decorate(request, response
, handler
);
+ return cacheControl.decorate(request, response);
}
else {
return true;
}
else {
return true;
@@
-52,7
+57,12
@@
public class CacheControlInterceptor implements HandlerInterceptor {
ModelAndView modelAndView
) throws Exception
{
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
}
@Override