You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/12/20 00:50:51 UTC
svn commit: r488856 - in /jakarta/jmeter/branches/rel-2-2:
bin/jmeter.properties src/core/org/apache/jmeter/threads/JMeterThread.java
xdocs/changes.xml
Author: sebb
Date: Tue Dec 19 15:50:50 2006
New Revision: 488856
URL: http://svn.apache.org/viewvc?view=rev&rev=488856
Log:
Bug 41140 - run PostProcessor in forward order
Modified:
jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties?view=diff&rev=488856&r1=488855&r2=488856
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties Tue Dec 19 15:50:50 2006
@@ -468,6 +468,25 @@
#csvdataset.eofstring=<EOF>
#---------------------------------------------------------------------------
+# LDAP Sampler configuration
+#---------------------------------------------------------------------------
+# Maximum number of search results returned by a search that will be sorted
+# to guarantee a stable ordering (if more results then this limit are retruned
+# then no sorting is done). Set to 0 to turn off all sorting, in which case
+# "Equals" response assertions will be very likely to fail against search results.
+#
+#ldapsampler.max_sorted_results=1000
+
+# Number of characters to log for each of three sections (starting matching section, diff section,
+# ending matching section where not all sections will appear for all diffs) diff display when an Equals
+# assertion fails. So a value of 100 means a maximum of 300 characters of diff text will be displayed
+# (+ a number of extra characters like "..." and "[[["/"]]]" which are used to decorate it).
+#assertion.equals_section_diff_len=100
+# test written out to log to signify start/end of diff delta
+#assertion.equals_diff_delta_start=[[[
+#assertion.equals_diff_delta_end=]]]
+
+#---------------------------------------------------------------------------
# Miscellaneous configuration
#---------------------------------------------------------------------------
@@ -496,7 +515,12 @@
# the following line.
#jmeterthread.startearlier=false
-# (2.1.2) StandardJMeterEngine behaviour has been changed to notify the listeners after
+# (2.2.1) JMeterThread behaviour has changed so that PostProcessors are run in forward order
+# (as they appear in the test plan) rather than reverse order as previously.
+# Uncomment the following line to revert to the original behaviour
+#jmeterthread.reversePostProcessors=true
+
+# (2.2) StandardJMeterEngine behaviour has been changed to notify the listeners after
# the running version is enabled. This is so they can access variables.
# In case this causes problems, the previous behaviour can be restored by uncommenting
# the following line.
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java?view=diff&rev=488856&r1=488855&r2=488856
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/threads/JMeterThread.java Tue Dec 19 15:50:50 2006
@@ -38,6 +38,7 @@
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.timers.Timer;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.collections.HashTreeTraverser;
import org.apache.jorphan.collections.SearchByClass;
@@ -214,8 +215,11 @@
* See below for reason for this change. Just in case this causes problems,
* allow the change to be backed out
*/
- private static final boolean startEarlier = org.apache.jmeter.util.JMeterUtils.getPropDefault(
- "jmeterthread.startearlier", true);
+ private static final boolean startEarlier =
+ JMeterUtils.getPropDefault("jmeterthread.startearlier", true); // $NON-NLS-1$
+
+ private static final boolean reversePostProcessors =
+ JMeterUtils.getPropDefault("jmeterthread.reversePostProcessors",false); // $NON-NLS-1$
static {
if (startEarlier) {
@@ -223,6 +227,11 @@
} else {
log.info("jmeterthread.startearlier=false (see jmeter.properties)");
}
+ if (reversePostProcessors) {
+ log.info("Running PostProcessors in reverse order");
+ } else {
+ log.info("Running PostProcessors in forward order");
+ }
}
public void run() {
@@ -424,11 +433,19 @@
private void runPostProcessors(List extractors) {
ListIterator iter = extractors.listIterator(extractors.size());
- while (iter.hasPrevious()) {
- PostProcessor ex = (PostProcessor) iter.previous();
- TestBeanHelper.prepare((TestElement) ex);
- ex.process();
- }
+ if (reversePostProcessors) {// Original (rather odd) behaviour
+ while (iter.hasPrevious()) {
+ PostProcessor ex = (PostProcessor) iter.previous();
+ TestBeanHelper.prepare((TestElement) ex);
+ ex.process();
+ }
+ } else {
+ while (iter.hasNext()) {
+ PostProcessor ex = (PostProcessor) iter.next();
+ TestBeanHelper.prepare((TestElement) ex);
+ ex.process();
+ }
+ }
}
private void delay(List timers) {
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=488856&r1=488855&r2=488856
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Tue Dec 19 15:50:50 2006
@@ -28,7 +28,16 @@
<h3>Version 2.2.1</h3>
<h4>Known problems:</h4>
-<p>As for 2.2</p>
+<p>As for 2.2 except as noted below.</p>
+
+<h4>Incompatible changes:</h4>
+<p>
+Bug 41104: JMeterThread behaviour was changed so that PostProcessors are run in forward order
+(as they appear in the test plan) rather than reverse order as previously.
+The original behaviour can be restored by setting the following JMeter property:
+<br/>
+jmeterthread.reversePostProcessors=true
+</p>
<h4>New functionality:</h4>
<ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org