root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Allow thread wait to be specified as a property 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@767771 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: d417a49c29
This commit is contained in:
Sebastian Bazley 2009-04-23 03:17:32 +00:00
parent a5f57614be
commit bc50dff5fa
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/jmeter.properties
View File

@ -208,7 +208,7 @@ log_level.jorphan=INFO
#log_file='jmeter_'yyyyMMddHHmmss'.tmp'
#---------------------------------------------------------------------------
# HTTP Javat configuration
# HTTP Java configuration
#---------------------------------------------------------------------------
# Number of connection retries performed by HTTP Java sampler before giving up
@ -645,6 +645,9 @@ beanshell.server.file=../extras/startup.bsh
# the following line.
#jmeterengine.startlistenerslater=false
# Number of milliseconds to wait for a thread to stop
#jmeterengine.threadstop.wait=5000
#Should JMeter expand the tree when loading a test plan?
#onload.expandtree=false

2
src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
View File

@ -57,7 +57,7 @@ public class StandardJMeterEngine implements JMeterEngine, JMeterThreadMonitor,
private static final long serialVersionUID = 233L; // Remember to change this when the class changes ...
private static final long WAIT_TO_DIE = 5 * 1000; // 5 seconds
private static final long WAIT_TO_DIE = JMeterUtils.getPropDefault("jmeterengine.threadstop.wait", 5 * 1000); // 5 seconds
/** JMeterThread => its JVM thread */
private final Map/*<JMeterThread, Thread>*/ allThreads;