Verhalten bei Seiten mit in die URL's enkodierter Session-ID korrigiert

[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 260048c..641bda3 100644 (file)
--- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControlInterceptor.java
@@ -121,11 +121,11 @@ public class CacheControlInterceptor implements HandlerInterceptor {
          * negative Werte für Last-Modified zurückliefert.
          */
         if (log.isDebugEnabled())
-          log.debug("Not modified since {}: {}", new Date(ifModifiedSince), url);
+          log.debug("{}: Not modified since {}", url, new Date(ifModifiedSince));
 
         if (ifNoneMatch == null) {
           /** Neue Anfrage oder HTTP/1.0 Client! */
-          log.debug("ETag nicht gesetzt: 304 {}", url);
+          log.debug("{}: ETag nicht gesetzt -> 304", url);
           response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
           return false;
         }
@@ -151,7 +151,6 @@ public class CacheControlInterceptor implements HandlerInterceptor {
        * Browser gecached werden!
        */
       if (request.isRequestedSessionIdFromURL()) {
-        cacheSeconds = 0;
         cacheControl.put("private", null);
       }
 
@@ -178,7 +177,7 @@ public class CacheControlInterceptor implements HandlerInterceptor {
          * <code>Expires</code>-Header für HTTP/1.0-Clients setzen.
          */
         cacheControl.put("max-age", Integer.toString(cacheSeconds));
-        response.setDateHeader(HEADER_EXPIRES, (now + cacheSeconds * 1000));
+        response.setDateHeader(HEADER_EXPIRES, (now + (long)cacheSeconds * 1000));
       }
 
       StringBuilder builder = new StringBuilder();