Author: sebb
Date: Wed May 5 14:10:04 2010
New Revision: 941300
URL: http://svn.apache.org/viewvc?rev=941300&view=rev
Log:
JMSConfigGui has been renamed as JMSSamplerGui.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=941300&r1=941299&r2=941300&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
Wed May 5 14:10:04 2010
@@ -174,7 +174,7 @@ public class TransactionController exten
{
if (res != null) {
res.setIdleTime(pauseTime+res.getIdleTime());
- res.sampleEnd();
+ res.sampleEnd();
res.setResponseMessage("Number of samples in transaction : " +
calls + ", number of failing samples : " + noFailingSamples);
if(res.isSuccessful()) {
res.setResponseCodeOK();
@@ -212,8 +212,8 @@ public class TransactionController exten
res.setThreadName(sampleResult.getThreadName());
res.setBytes(res.getBytes() + sampleResult.getBytes());
if (!isIncludeTimers()) {// Accumulate waiting time for later
- pauseTime += sampleResult.getEndTime() -
sampleResult.getTime() - prevEndTime;
- prevEndTime = sampleResult.getEndTime();
+ pauseTime += sampleResult.getEndTime() -
sampleResult.getTime() - prevEndTime;
+ prevEndTime = sampleResult.getEndTime();
}
if(!sampleResult.isSuccessful()) {
res.setSuccessful(false);
@@ -246,7 +246,7 @@ public class TransactionController exten
* @return boolean (defaults to true for backwards compatibility)
*/
public boolean isIncludeTimers() {
- return getPropertyAsBoolean(INCLUDE_TIMERS, true);
+ return getPropertyAsBoolean(INCLUDE_TIMERS, true);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java?rev=941300&r1=941299&r2=941300&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
Wed May 5 14:10:04 2010
@@ -34,7 +34,7 @@ public class TransactionControllerGui ex
private static final long serialVersionUID = 240L;
private JCheckBox parent; // If selected, then generate parent sample,
otherwise as per original controller
-
+
private JCheckBox includeTimers; // if selected, add duration of timers to
total runtime
/**
@@ -55,7 +55,7 @@ public class TransactionControllerGui ex
public void configure(TestElement el) {
super.configure(el);
parent.setSelected(((TransactionController) el).isParent());
- includeTimers.setSelected(((TransactionController)
el).isIncludeTimers());
+ includeTimers.setSelected(((TransactionController)
el).isIncludeTimers());
}
/* Implements JMeterGUIComponent.modifyTestElement(TestElement) */
