Author: sebb
Date: Sun Feb 15 01:15:11 2009
New Revision: 744592
URL: http://svn.apache.org/viewvc?rev=744592&view=rev
Log:
The JMeter variable "sample_variables" is sent to all server instances to
ensure the data is available to the client.
Modified:
jakarta/jmeter/trunk/bin/jmeter.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml
Modified: jakarta/jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.properties?rev=744592&r1=744591&r2=744592&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.properties (original)
+++ jakarta/jmeter/trunk/bin/jmeter.properties Sun Feb 15 01:15:11 2009
@@ -333,6 +333,8 @@
#sample_variables=SESSION_ID,REFERENCE
# N.B. The current implementation saves the values in XML as attributes,
# so the names must be valid XML names.
+# Versions of JMeter after 2.3.2 send the variable to all servers
+# to ensure that the correct data is available at the client.
# Optional xml processing instruction for line 2 of the file:
#jmeter.save.saveservice.xml_pi=<?xml-stylesheet type="text/xsl"
href="../extras/jmeter-results-detail-report_21.xsl"?>
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=744592&r1=744591&r2=744592&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Feb 15
01:15:11 2009
@@ -61,6 +61,7 @@
import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.reporters.Summariser;
import org.apache.jmeter.samplers.Remoteable;
+import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.services.FileServer;
import org.apache.jmeter.testelement.TestElement;
@@ -640,6 +641,10 @@
}
}
+ String sample_variables = (String)
jmeterProps.get(SampleEvent.SAMPLE_VARIABLES);
+ if (sample_variables != null){
+ remoteProps.put(SampleEvent.SAMPLE_VARIABLES, sample_variables);
+ }
}
/*
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java?rev=744592&r1=744591&r2=744592&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
Sun Feb 15 01:15:11 2009
@@ -36,6 +36,8 @@
private static final long serialVersionUID = 232L;
+ public static final String SAMPLE_VARIABLES = "sample_variables"; //
$NON-NLS-1$
+
public static final String HOSTNAME;
// List of variable names to be saved in JTL files
@@ -55,7 +57,7 @@
}
HOSTNAME=hn;
- String vars = JMeterUtils.getProperty("sample_variables"); //
$NON-NLS-1$
+ String vars = JMeterUtils.getProperty(SAMPLE_VARIABLES);
variableNames=vars != null ? vars.split(",") : new String[0];
varCount=variableNames.length;
if (varCount>0){
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=744592&r1=744591&r2=744592&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sun Feb 15 01:15:11 2009
@@ -186,6 +186,7 @@
<li>Mailer Visualiser - fix parsing of multiple e-mail address when using Test
button</li>
<li>Bug 46435 - More verbose error msg for error 501 (Proxy Server)</li>
<li>Bug 46491 - Incorrect value for the last variable in "CSV Data Set Config"
(error in processing quoted strings)</li>
+<li>The JMeter variable "sample_variables" is sent to all server instances to
ensure the data is available to the client.</li>
</ul>
<h3>Improvements</h3>
Modified: jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml?rev=744592&r1=744591&r2=744592&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml Sun Feb 15 01:15:11 2009
@@ -170,6 +170,8 @@
#sample_variables=SESSION_ID,REFERENCE
# N.B. The current implementation saves the values in XML as attributes,
# so the names must be valid XML names.
+# Versions of JMeter after 2.3.2 send the variable to all servers
+# to ensure that the correct data is available at the client.
# Optional xml processing instruction for line 2 of the file:
#jmeter.save.saveservice.xml_pi=&lt;?xml-stylesheet type="text/xsl"
href="sample.xsl"?>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
