X-Git-Url: https://juplo.de/gitweb/?p=percentcodec;a=blobdiff_plain;f=cachecontrol%2Fsrc%2Fmain%2Fjava%2Fde%2Fhalbekunst%2Fjuplo%2Fcachecontrol%2FCacheControlInterceptor.java;h=641bda341e809ccf0cb8a9becd0b9b82a9ac25b6;hp=260048cb0e9f9d73cc111ba28b9cb8574b5ae08c;hb=a266075162d622783b9b56e6e7fe2a17cf104421;hpb=d1a067158051e0529691eabba6d61764993b7938

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 260048cb..641bda34 100644
--- 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();