Author: pmouawad
Date: Mon Apr 17 19:32:50 2017
New Revision: 1791716

URL: http://svn.apache.org/viewvc?rev=1791716&view=rev
Log:
Improve logging

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

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1791716&r1=1791715&r2=1791716&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Mon Apr 17 19:32:50 2017
@@ -88,13 +88,9 @@ public class CookieManager extends Confi
         JMeterUtils.getPropDefault("CookieManager.check.cookies", true);// $NON-NLS-1$
 
     static {
-        log.info("Settings:"
-                + " Delete null: " + DELETE_NULL_COOKIES
-                + " Check: " + CHECK_COOKIES
-                + " Allow variable: " + ALLOW_VARIABLE_COOKIES
-                + " Save: " + SAVE_COOKIES
-                + " Prefix: " + COOKIE_NAME_PREFIX
-                );
+        log.info("Settings: Delete null: {} Check: {} Allow variable: {} Save: {} Prefix: {}", 
+                DELETE_NULL_COOKIES, CHECK_COOKIES, ALLOW_VARIABLE_COOKIES, 
+                SAVE_COOKIES, COOKIE_NAME_PREFIX);
     }
     private transient CookieHandler cookieHandler;
 
@@ -306,11 +302,11 @@ public class CookieManager extends Confi
 
         if (DELETE_NULL_COOKIES && (null == cv || cv.length()==0)) {
             if (log.isDebugEnabled()) {
-                log.debug("Dropping cookie with null value " + c.toString());
+                log.debug("Dropping cookie with null value {}", c.toString());
             }
         } else {
             if (log.isDebugEnabled()) {
-                log.debug("Add cookie to store " + c.toString());
+                log.debug("Add cookie to store {}", c.toString());
             }
             getCookies().addItem(c);
             if (SAVE_COOKIES)  {
@@ -399,8 +395,8 @@ public class CookieManager extends Confi
             }
             if (match(cookie,newCookie)) {
                 if (log.isDebugEnabled()) {
-                    log.debug("New Cookie = " + newCookie.toString()
-                              + " removing matching Cookie " + cookie.toString());
+                    log.debug("New Cookie = {} removing matching Cookie {}",
+                            newCookie.toString(), cookie.toString());
                 }
                 iter.remove();
             }
@@ -414,10 +410,10 @@ public class CookieManager extends Confi
         try {
             cookieHandler = (CookieHandler) ClassTools.construct(getImplementation(), getPolicy());
         } catch (JMeterException e) {
-            log.error("Unable to load or invoke class: " + getImplementation(), e);
+            log.error("Unable to load or invoke class: {}", getImplementation(), e);
         }
         if (log.isDebugEnabled()){
-            log.debug("Policy: "+getPolicy()+" Clear: "+getClearEachIteration());
+            log.debug("Policy: {} Clear: {}", getPolicy(), getClearEachIteration());
         }
     }