From bc50dff5fac3af9a35b14a233249e120bf8671ce Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Thu, 23 Apr 2009 03:17:32 +0000 Subject: [PATCH] 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: d417a49c29df9126c7477447f7b180cd38af7f57 --- bin/jmeter.properties | 5 ++++- src/core/org/apache/jmeter/engine/StandardJMeterEngine.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/jmeter.properties b/bin/jmeter.properties index e961e5c80c..3e66605e6d 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -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 diff --git a/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java b/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java index 9dfe0d8ef4..90fef14e0c 100644 --- a/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java +++ b/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java @@ -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/**/ allThreads;