You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2011/12/16 15:13:08 UTC
svn commit: r1215137 -
/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
Author: sebb
Date: Fri Dec 16 14:13:07 2011
New Revision: 1215137
URL: http://svn.apache.org/viewvc?rev=1215137&view=rev
Log:
Revert to original names and locations used for the static server values.
Makes it easier to follow the changes since the 2.5.1 release
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java?rev=1215137&r1=1215136&r2=1215137&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java Fri Dec 16 14:13:07 2011
@@ -43,23 +43,28 @@ public class StatisticalSampleSender ext
private static final long DEFAULT_TIME_THRESHOLD = 60000L;
- private final int clientConfiguredNumSamplesThreshold = JMeterUtils.getPropDefault(
+ // Static fields are set by the server when the class is constructed
+
+ private static final int NUM_SAMPLES_THRESHOLD = JMeterUtils.getPropDefault(
"num_sample_threshold", DEFAULT_NUM_SAMPLE_THRESHOLD);
- private final long clientConfiguredTimeThresholdMs = JMeterUtils.getPropDefault("time_threshold",
+ private static final long TIME_THRESHOLD_MS = JMeterUtils.getPropDefault("time_threshold",
DEFAULT_TIME_THRESHOLD);
// should the samples be aggregated on thread name or thread group (default) ?
- private boolean clientConfiguredKeyOnThreadName = JMeterUtils.getPropDefault("key_on_threadname", false);
+ private static boolean KEY_ON_THREADNAME = JMeterUtils.getPropDefault("key_on_threadname", false);
+
+ // Instance fields are constructed by the client when the instance is create in the test plan
+ // and the field values are then transferred to the server copy by RMI serialisation/deserialisation
- private static final int serverConfiguredNumSamplesThreshold = JMeterUtils.getPropDefault(
+ private final int clientConfiguredNumSamplesThreshold = JMeterUtils.getPropDefault(
"num_sample_threshold", DEFAULT_NUM_SAMPLE_THRESHOLD);
- private static final long serverConfiguredTimeThresholdMs = JMeterUtils.getPropDefault("time_threshold",
+ private final long clientConfiguredTimeThresholdMs = JMeterUtils.getPropDefault("time_threshold",
DEFAULT_TIME_THRESHOLD);
-
+
// should the samples be aggregated on thread name or thread group (default) ?
- private static boolean serverConfiguredKeyOnThreadName = JMeterUtils.getPropDefault("key_on_threadname", false);
+ private boolean clientConfiguredKeyOnThreadName = JMeterUtils.getPropDefault("key_on_threadname", false);
private final RemoteSampleListener listener;
@@ -186,7 +191,7 @@ public class StatisticalSampleSender ext
*/
private long getTimeThresholdMs() {
return isClientConfigured() ?
- clientConfiguredTimeThresholdMs : serverConfiguredTimeThresholdMs;
+ clientConfiguredTimeThresholdMs : TIME_THRESHOLD_MS;
}
/**
@@ -194,7 +199,7 @@ public class StatisticalSampleSender ext
*/
private int getNumSamplesThreshold() {
return isClientConfigured() ?
- clientConfiguredNumSamplesThreshold: serverConfiguredNumSamplesThreshold;
+ clientConfiguredNumSamplesThreshold: NUM_SAMPLES_THRESHOLD;
}
/**
@@ -202,7 +207,7 @@ public class StatisticalSampleSender ext
*/
private boolean getKeyOnThreadName() {
return isClientConfigured() ?
- clientConfiguredKeyOnThreadName: serverConfiguredKeyOnThreadName;
+ clientConfiguredKeyOnThreadName: KEY_ON_THREADNAME;
}
/**