svn commit: r1781990 - /jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java

[pm...@apache.org]

Author: pmouawad
Date: Tue Feb  7 12:05:18 2017
New Revision: 1781990

URL: http://svn.apache.org/viewvc?rev=1781990&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Use parameterized messages and improve logs
Bugzilla Id: 60564

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java?rev=1781990&r1=1781989&r2=1781990&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ForeachController.java Tue Feb  7 12:05:18 2017
@@ -25,8 +25,8 @@ import org.apache.jmeter.testelement.pro
 import org.apache.jmeter.testelement.property.StringProperty;
 import org.apache.jmeter.threads.JMeterContext;
 import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ForeachController that iterates over a list of variables named XXXX_NN stored in {@link JMeterVariables}
@@ -36,9 +36,9 @@ import org.apache.log.Logger;
  *
  */
 public class ForeachController extends GenericController implements Serializable {
-    private static final Logger log = LoggingManager.getLoggerForClass();
+    private static final Logger log = LoggerFactory.getLogger(ForeachController.class);
 
-    private static final long serialVersionUID = 240L;
+    private static final long serialVersionUID = 241L;
 
     private static final String INPUTVAL = "ForeachController.inputVal";// $NON-NLS-1$
 
@@ -163,7 +163,9 @@ public class ForeachController extends G
         if (currentVariable != null) {
             variables.putObject(getReturnVal(), currentVariable);
             if (log.isDebugEnabled()) {
-                log.debug("ForEach resultstring isDone=" + variables.get(getReturnVal()));
+                log.debug("{} : Found in vars:{}, isDone:{}", 
+                        getName(), inputVariable, false);
+
             }
             return false;
         }
@@ -177,10 +179,16 @@ public class ForeachController extends G
         JMeterContext context = getThreadContext();
         String inputVariable = getInputVal() + getSeparator() + (loopCount + 1);
         if (context.getVariables().getObject(inputVariable) != null) {
-            log.debug("ForEach resultstring eofArgs= false");
+            if(log.isDebugEnabled()) {
+                log.debug("{} : Found in vars:{}, not end of Arguments", 
+                        getName(), inputVariable);
+            }
             return false;
         }
-        log.debug("ForEach resultstring eofArgs= true");
+        if(log.isDebugEnabled()) {
+            log.debug("{} : Did not find in vars:{}, End of Arguments reached", 
+                    getName(), inputVariable);
+        }
         return true;
     }
 
@@ -213,7 +221,8 @@ public class ForeachController extends G
             return false;
         }
         if (log.isDebugEnabled()) {
-            log.debug("No entries found - null first entry: " + inputVariable);
+            log.debug("{} No entries found - null first entry: {}", 
+                    getName(), inputVariable);
         }
         return true;
     }