svn commit: r1803368 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java

[fs...@apache.org]

Author: fschumacher
Date: Sat Jul 29 13:56:40 2017
New Revision: 1803368

URL: http://svn.apache.org/viewvc?rev=1803368&view=rev
Log:
Simplify logging a bit and log more details (varyHeader).

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java?rev=1803368&r1=1803367&r2=1803368&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java Sat Jul 29 13:56:40 2017
@@ -227,16 +227,8 @@ public class CacheManager extends Config
 
     // helper method to save the cache entry
     private void setCache(String lastModified, String cacheControl, String expires, String etag, String url, String date, Pair<String, String> varyHeader) {
-        if (log.isDebugEnabled()){
-            log.debug("setCache("
-                  + lastModified + "," 
-                  + cacheControl + ","
-                  + expires + "," 
-                  + etag + ","
-                  + url + ","
-                  + date
-                  + ")");
-        }
+        log.debug("setCache({}, {}, {}, {}, {}, {}, {})", lastModified,
+                cacheControl, expires, etag, url, date, varyHeader);
         Date expiresDate = null; // i.e. not using Expires
         if (useExpires) {// Check that we are processing Expires/CacheControl
             final String maxAge = "max-age=";
@@ -270,10 +262,7 @@ public class CacheManager extends Config
                 return;
             }
             CacheEntry cacheEntry = new CacheEntry(lastModified, expiresDate, etag, null);
-            if (log.isDebugEnabled()) {
-                log.debug("Set entry {} into cache for url {}", url,
-                        cacheEntry);
-            }
+            log.debug("Set entry {} into cache for url {}", url, cacheEntry);
             getCache().put(url, cacheEntry);
         }
     }