You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/09 07:37:28 UTC
svn commit: r1782295 - in /jmeter/trunk/src/components/org/apache/jmeter:
assertions/ assertions/gui/ config/ control/ extractor/ modifiers/ sampler/
timers/
Author: pmouawad
Date: Thu Feb 9 07:37:28 2017
New Revision: 1782295
URL: http://svn.apache.org/viewvc?rev=1782295&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - check log level in non-error logging if method invoked in params
Contributed by Woonsan Ko
This closes #267
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java
jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java Thu Feb 9 07:37:28 2017
@@ -43,7 +43,9 @@ public class BSFAssertion extends BSFTes
processFileOrScript(mgr);
result.setError(false);
} catch (BSFException e) {
- log.warn("Problem in BSF script {}",e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("Problem in BSF script {}", e.toString());
+ }
result.setFailure(true);
result.setError(true);
result.setFailureMessage(e.toString());
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java Thu Feb 9 07:37:28 2017
@@ -118,7 +118,9 @@ public class BeanShellAssertion extends
{
result.setError(true);
result.setFailureMessage(ex.toString());
- log.warn(ex.toString());
+ if (log.isWarnEnabled()) {
+ log.warn(ex.toString());
+ }
}
return result;
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java Thu Feb 9 07:37:28 2017
@@ -118,8 +118,9 @@ public class XMLSchemaAssertion extends
}
} catch (SAXException e) {
-
- log.warn(e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn(e.toString());
+ }
result.setResultForFailure(e.getMessage());
} catch (IOException e) {
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java Thu Feb 9 07:37:28 2017
@@ -196,7 +196,7 @@ public class XPathPanel extends JPanel {
testDoc.appendChild(el);
XPathUtil.validateXPath(testDoc, xpathString);
} catch (IllegalArgumentException | ParserConfigurationException | TransformerException e) {
- log.warn(e.getLocalizedMessage(), e);
+ log.warn("Exception while validating XPath.", e);
success = false;
ret = e.getLocalizedMessage();
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/RandomVariableConfig.java Thu Feb 9 07:37:28 2017
@@ -202,7 +202,7 @@ public class RandomVariableConfig extend
seed = Long.parseLong(randomSeed);
} catch (NumberFormatException e) {
seed = System.currentTimeMillis();
- log.warn("Cannot parse seed: {}. {}", randomSeed, e.getLocalizedMessage());
+ log.warn("Cannot parse random seed: '{}'", randomSeed);
}
}
return seed;
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java Thu Feb 9 07:37:28 2017
@@ -126,7 +126,9 @@ public class CriticalSectionController e
@Override
public Sampler next() {
if (StringUtils.isEmpty(getLockName())) {
- log.warn("Empty lock name in Critical Section Controller: {}", getName());
+ if (log.isWarnEnabled()) {
+ log.warn("Empty lock name in Critical Section Controller: {}", getName());
+ }
return super.next();
}
if (isFirst()) {
@@ -170,7 +172,9 @@ public class CriticalSectionController e
public void threadFinished() {
if (this.currentLock != null
&& this.currentLock.isHeldByCurrentThread()) {
- log.warn("Lock '{}' not released in: {}, releasing in threadFinished", getLockName(), getName());
+ if (log.isWarnEnabled()) {
+ log.warn("Lock '{}' not released in: {}, releasing in threadFinished", getLockName(), getName());
+ }
this.currentLock.unlock();
}
this.currentLock = null;
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java Thu Feb 9 07:37:28 2017
@@ -129,7 +129,9 @@ public class IncludeController extends G
if(!file.exists() && !file.isAbsolute()){
log.info("loadIncludedElements -failed for: {}", absolutePath);
file = new File(FileServer.getFileServer().getBaseDir(), includePath);
- log.info("loadIncludedElements -Attempting to read it from: {}", file.getAbsolutePath());
+ if (log.isInfoEnabled()) {
+ log.info("loadIncludedElements -Attempting to read it from: {}", file.getAbsolutePath());
+ }
if(!file.canRead() || !file.isFile()){
log.error("Include Controller '{}' can't load '{}' - see log for details", this.getName(),
fileName);
Modified: jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java Thu Feb 9 07:37:28 2017
@@ -137,10 +137,11 @@ public class ThroughputController extend
if (prop instanceof IntegerProperty) {
retVal = ((IntegerProperty) prop).getIntValue();
} else {
+ String valueString = prop.getStringValue();
try {
- retVal = Integer.parseInt(prop.getStringValue());
+ retVal = Integer.parseInt(valueString);
} catch (NumberFormatException e) {
- log.warn("Error parsing {}", prop.getStringValue(), e);
+ log.warn("Error parsing '{}'", valueString, e);
}
}
return retVal;
@@ -164,10 +165,11 @@ public class ThroughputController extend
if (prop instanceof FloatProperty) {
retVal = ((FloatProperty) prop).getFloatValue();
} else {
+ String valueString = prop.getStringValue();
try {
- retVal = Float.parseFloat(prop.getStringValue());
+ retVal = Float.parseFloat(valueString);
} catch (NumberFormatException e) {
- log.warn("Error parsing {}", prop.getStringValue(),e);
+ log.warn("Error parsing '{}'", valueString, e);
}
}
return retVal;
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/BSFPostProcessor.java Thu Feb 9 07:37:28 2017
@@ -39,7 +39,9 @@ public class BSFPostProcessor extends BS
mgr = getManager();
processFileOrScript(mgr);
} catch (BSFException e) {
- log.warn("Problem in BSF script {}", e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("Problem in BSF script: {}", e.toString());
+ }
} finally {
if (mgr != null) {
mgr.terminate();
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java Thu Feb 9 07:37:28 2017
@@ -63,7 +63,9 @@ public class BeanShellPostProcessor exte
bshInterpreter.set("data", prev.getResponseData());//$NON-NLS-1$
processFileOrScript(bshInterpreter);
} catch (JMeterException e) {
- log.warn("Problem in BeanShell script: {}", e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("Problem in BeanShell script: {}", e.toString());
+ }
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java Thu Feb 9 07:37:28 2017
@@ -117,7 +117,9 @@ public class HtmlExtractor extends Abstr
try {
prevCount = Integer.parseInt(prevString);
} catch (NumberFormatException nfe) {
- log.warn("{}: Could not parse number '{}'.", getName(), prevString);
+ if (log.isWarnEnabled()) {
+ log.warn("{}: Could not parse number: '{}'.", getName(), prevString);
+ }
}
}
int matchCount=0;// Number of refName_n variable sets to keep
@@ -145,7 +147,9 @@ public class HtmlExtractor extends Abstr
vars.remove(refNameN);
}
} catch (RuntimeException e) {
- log.warn("{}: Error while generating result. {}", getName(), e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("{}: Error while generating result. {}", getName(), e.toString());
+ }
}
}
@@ -185,8 +189,10 @@ public class HtmlExtractor extends Abstr
getExtractorImpl().extract(expression, attribute, matchNumber, inputString, result, found, "-1");
} else {
if(inputString==null) {
- log.warn("No variable '{}' found to process by CSS/JQuery Extractor '{}', skipping processing",
- getVariableName(), getName());
+ if (log.isWarnEnabled()) {
+ log.warn("No variable '{}' found to process by CSS/JQuery Extractor '{}', skipping processing",
+ getVariableName(), getName());
+ }
}
return Collections.emptyList();
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java Thu Feb 9 07:37:28 2017
@@ -130,7 +130,7 @@ public class RegexExtractor extends Abst
try {
prevCount = Integer.parseInt(prevString);
} catch (NumberFormatException nfe) {
- log.warn("Could not parse number: '{}', message: '{}'", prevString, nfe.toString());
+ log.warn("Could not parse number: '{}'", prevString);
}
}
int matchCount=0;// Number of refName_n variable sets to keep
@@ -199,8 +199,10 @@ public class RegexExtractor extends Abst
if (isScopeVariable()){
String inputString=vars.get(getVariableName());
if(inputString == null) {
- log.warn("No variable '{}' found to process by RegexExtractor '{}', skipping processing",
- getVariableName(), getName());
+ if (log.isWarnEnabled()) {
+ log.warn("No variable '{}' found to process by RegexExtractor '{}', skipping processing",
+ getVariableName(), getName());
+ }
return Collections.emptyList();
}
matchStrings(matchNumber, matcher, pattern, matches, found,
@@ -251,7 +253,7 @@ public class RegexExtractor extends Abst
try {
previous=Integer.parseInt(prevString);
} catch (NumberFormatException nfe) {
- log.warn("Could not parse number: '{}', message:'{}'", prevString, nfe.toString());
+ log.warn("Could not parse number: '{}'.", prevString);
}
}
//Note: match.groups() includes group 0
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java Thu Feb 9 07:37:28 2017
@@ -134,8 +134,10 @@ public class XPathExtractor extends Abst
getValuesForXPath(d,getXPathQuery(), matches, matchNumber);
}
} else {
- log.warn("No variable '{}' found to process by XPathExtractor '{}', skipping processing",
- getVariableName(), getName());
+ if (log.isWarnEnabled()) {
+ log.warn("No variable '{}' found to process by XPathExtractor '{}', skipping processing",
+ getVariableName(), getName());
+ }
}
} else {
List<SampleResult> samples = getSampleList(previousResult);
@@ -175,10 +177,14 @@ public class XPathExtractor extends Abst
log.error(errrorMessage,e);
throw new JMeterError(errrorMessage,e);
} catch (SAXException e) {// Can happen for bad input document
- log.warn("SAXException while processing ({}). {}", getXPathQuery(), e.getLocalizedMessage());
+ if (log.isWarnEnabled()) {
+ log.warn("SAXException while processing ({}). {}", getXPathQuery(), e.getLocalizedMessage());
+ }
addAssertionFailure(previousResult, e, false); // Should this also fail the sample?
} catch (TransformerException e) {// Can happen for incorrect XPath expression
- log.warn("TransformerException while processing ({}). {}", getXPathQuery(), e.getLocalizedMessage());
+ if (log.isWarnEnabled()) {
+ log.warn("TransformerException while processing ({}). {}", getXPathQuery(), e.getLocalizedMessage());
+ }
addAssertionFailure(previousResult, e, false);
} catch (TidyException e) {
// Will already have been logged by XPathUtil
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java Thu Feb 9 07:37:28 2017
@@ -42,7 +42,9 @@ public class BSFPreProcessor extends BSF
}
processFileOrScript(mgr);
} catch (BSFException e) {
- log.warn("Problem in BSF script. {}", e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("Problem in BSF script. {}", e.toString());
+ }
} finally {
if (mgr != null) {
mgr.terminate();
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java Thu Feb 9 07:37:28 2017
@@ -58,7 +58,9 @@ public class BeanShellPreProcessor exten
bshInterpreter.set("sampler", sam);//$NON-NLS-1$
processFileOrScript(bshInterpreter);
} catch (JMeterException e) {
- log.warn("Problem in BeanShell script. {}", e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("Problem in BeanShell script. {}", e.toString());
+ }
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java Thu Feb 9 07:37:28 2017
@@ -51,8 +51,6 @@ public class SampleTimeout extends Abstr
private ScheduledFuture<?> future;
private final transient ScheduledExecutorService execService;
-
- private final boolean debug;
private static class TPOOLHolder {
private TPOOLHolder() {
@@ -75,9 +73,8 @@ public class SampleTimeout extends Abstr
* No-arg constructor.
*/
public SampleTimeout() {
- debug = log.isDebugEnabled();
execService = getExecutorService();
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug(whoAmI("InterruptTimer()", this));
}
}
@@ -101,7 +98,7 @@ public class SampleTimeout extends Abstr
@Override
public void sampleStarting(Sampler sampler) {
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug(whoAmI("sampleStarting()", this));
}
createTask(sampler);
@@ -109,7 +106,7 @@ public class SampleTimeout extends Abstr
@Override
public void sampleEnded(final Sampler sampler) {
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug(whoAmI("sampleEnded()", this));
}
cancelTask();
@@ -130,9 +127,11 @@ public class SampleTimeout extends Abstr
boolean interrupted = sampler.interrupt();
String elapsed = Double.toString((double)(System.nanoTime()-start)/ 1000000000)+" secs";
if (interrupted) {
- log.warn("Call Done interrupting {} took {}", getInfo(samp), elapsed);
+ if (log.isWarnEnabled()) {
+ log.warn("Call Done interrupting {} took {}", getInfo(samp), elapsed);
+ }
} else {
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug("Call Didn't interrupt: {} took {}", getInfo(samp), elapsed);
}
}
@@ -140,21 +139,21 @@ public class SampleTimeout extends Abstr
};
// schedule the interrupt to occur and save for possible cancellation
future = execService.schedule(call, timeout, TimeUnit.MILLISECONDS);
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug("Scheduled timer: @{} {}", System.identityHashCode(future), getInfo(samp));
}
}
@Override
public void threadStarted() {
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug(whoAmI("threadStarted()", this));
}
}
@Override
public void threadFinished() {
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug(whoAmI("threadFinished()", this));
}
cancelTask(); // cancel future if any
@@ -171,7 +170,7 @@ public class SampleTimeout extends Abstr
}
private String whoAmI(String id, TestElement o) {
- return id + " @" + System.identityHashCode(o)+ " '"+ o.getName() + "' " + (debug ? Thread.currentThread().getName() : "");
+ return id + " @" + System.identityHashCode(o)+ " '"+ o.getName() + "' " + (log.isDebugEnabled() ? Thread.currentThread().getName() : "");
}
private String getInfo(TestElement o) {
@@ -182,7 +181,7 @@ public class SampleTimeout extends Abstr
if (future != null) {
if (!future.isDone()) {
boolean cancelled = future.cancel(false);
- if (debug) {
+ if (log.isDebugEnabled()) {
log.debug("Cancelled timer: @{} with result {}", System.identityHashCode(future), cancelled);
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Thu Feb 9 07:37:28 2017
@@ -109,7 +109,7 @@ public class TestAction extends Abstract
try {
millis=Long.parseLong(timeInMillis);
} catch (NumberFormatException e){
- log.warn("Could not create number from {}", timeInMillis);
+ log.warn("Could not parse number: '{}'", timeInMillis);
millis=0;
}
try {
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java Thu Feb 9 07:37:28 2017
@@ -44,7 +44,9 @@ public class BSFTimer extends BSFTestEle
}
delay = Long.parseLong(o.toString());
} catch (NumberFormatException | BSFException e) {
- log.warn("Problem in BSF script. {}", e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("Problem in BSF script. {}", e.toString());
+ }
} finally {
if(mgr != null) {
mgr.terminate();
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java Thu Feb 9 07:37:28 2017
@@ -55,12 +55,14 @@ public class BeanShellTimer extends Bean
ret=o.toString();
}
} catch (JMeterException e) {
- log.warn("Problem in BeanShell script. {}", e.toString());
+ if (log.isWarnEnabled()) {
+ log.warn("Problem in BeanShell script. {}", e.toString());
+ }
}
try {
return Long.decode(ret).longValue();
} catch (NumberFormatException e){
- log.warn(e.getLocalizedMessage());
+ log.warn("Number format exception while decoding number: '{}'", ret);
return 0;
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1782295&r1=1782294&r2=1782295&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java Thu Feb 9 07:37:28 2017
@@ -181,7 +181,9 @@ public class SyncTimer extends AbstractT
} catch (InterruptedException | BrokenBarrierException e) {
return 0;
} catch (TimeoutException e) {
- log.warn("SyncTimer {} timeouted waiting for users after: {}ms", getName(), getTimeoutInMs());
+ if (log.isWarnEnabled()) {
+ log.warn("SyncTimer {} timeouted waiting for users after: {}ms", getName(), getTimeoutInMs());
+ }
return 0;
} finally {
if(arrival == 0) {