Author: pmouawad
Date: Wed Dec 28 18:08:20 2016
New Revision: 1776315
URL: http://svn.apache.org/viewvc?rev=1776315&view=rev
Log:
sonar: fix errors and mention change in changes.xml and component reference
Modified:
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified:
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java?rev=1776315&r1=1776314&r2=1776315&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
(original)
+++
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
Wed Dec 28 18:08:20 2016
@@ -127,7 +127,7 @@ public class SystemSampler extends Abstr
env.put(arg.getName(), arg.getPropertyAsString(Argument.VALUE));
}
- File directory = null;
+ File directory;
if(StringUtils.isEmpty(getDirectory())) {
directory = new File(FileServer.getDefaultBase());
if(log.isDebugEnabled()) {
@@ -155,7 +155,7 @@ public class SystemSampler extends Abstr
results.sampleStart();
int returnCode = nativeCommand.run(cmds);
results.sampleEnd();
- results.setResponseCode(Integer.toString(returnCode)); // TODO is
this the best way to do this?
+ results.setResponseCode(Integer.toString(returnCode));
if(log.isDebugEnabled()) {
log.debug("Ran : "+cmdLine + " using working directory:
"+directory.getAbsolutePath()+
" with execution environment:
"+nativeCommand.getExecutionEnvironment()+ " => " + returnCode);
@@ -171,13 +171,14 @@ public class SystemSampler extends Abstr
} catch (IOException ioe) {
results.sampleEnd();
results.setSuccessful(false);
- // results.setResponseCode("???"); TODO what code should be set
here?
+ results.setResponseCode("500"); //$NON-NLS-1$
results.setResponseMessage("Exception occurred whilst executing
system call: " + ioe);
} catch (InterruptedException ie) {
results.sampleEnd();
results.setSuccessful(false);
- // results.setResponseCode("???"); TODO what code should be set
here?
+ results.setResponseCode("500"); //$NON-NLS-1$
results.setResponseMessage("System Sampler interrupted whilst
executing system call: " + ie);
+ Thread.currentThread().interrupt();
}
if (nativeCommand != null) {
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1776315&r1=1776314&r2=1776315&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Dec 28 18:08:20 2016
@@ -83,6 +83,7 @@ Fill in some detail.
<ul>
<li>JMeter requires now at least a JAVA 8 version to run.</li>
+ <li>Process Sampler now returns error code 500 when an error occurs. It
previously returned an empty value.</li>
</ul>
<h3>Deprecated and removed elements or functions</h3>
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1776315&r1=1776314&r2=1776315&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Dec 28 18:08:20
2016
@@ -1966,7 +1966,7 @@ If omitted, output is captured and retur
<property name="Standard error (stderr)" required="No">Name of output file for
standard error (<code>STDERR</code>).
If omitted, output is captured and returned as the response data.</property>
<property name="Check Return Code" required="No">If checked, sampler will
compare return code with <code>Expected Return Code</code>.</property>
-<property name="Expected Return Code" required="No">Expected return code for
System Call, required if "<code>Check Return Code</code>" is checked.</property>
+<property name="Expected Return Code" required="No">Expected return code for
System Call, required if "<code>Check Return Code</code>" is checked. Note 500
is used as an error indicator in JMeter so you should not use it.</property>
<property name="Timeout" required="No">Timeout for command in milliseconds,
defaults to <code>0</code>, which means <em>no</em> timeout.
If the timeout expires before the command finishes, JMeter will attempt to
kill the OS process.
</property>
