Author: sebb
Date: Thu Apr 23 03:17:32 2009
New Revision: 767771
URL: http://svn.apache.org/viewvc?rev=767771&view=rev
Log:
Allow thread wait to be specified as a property
Modified:
jakarta/jmeter/trunk/bin/jmeter.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Modified: jakarta/jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.properties?rev=767771&r1=767770&r2=767771&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.properties (original)
+++ jakarta/jmeter/trunk/bin/jmeter.properties Thu Apr 23 03:17:32 2009
@@ -208,7 +208,7 @@
#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 @@
# 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
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=767771&r1=767770&r2=767771&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Thu Apr 23 03:17:32 2009
@@ -57,7 +57,7 @@
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
