Author: sebb
Date: Mon Apr 27 00:58:49 2009
New Revision: 768846

URL: http://svn.apache.org/viewvc?rev=768846&view=rev
Log:
Move setup of current sampler later after we have processed Transaction Sampler

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java

Modified: 
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=768846&r1=768845&r2=768846&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java 
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java 
Mon Apr 27 00:58:49 2009
@@ -282,8 +282,6 @@
     private SampleResult process_sampler(Sampler current, Sampler parent, 
JMeterContext threadContext) {
         SampleResult transactionResult = null;
         try {
-            threadContext.setCurrentSampler(current);
-
             // Check if we are running a transaction
             TransactionSampler transactionSampler = null;
             if(current instanceof TransactionSampler) {
@@ -329,6 +327,7 @@
 
             // Check if we have a sampler to sample
             if(current != null) {
+                threadContext.setCurrentSampler(current);
                 // Get the sampler ready to sample
                 SamplePackage pack = compiler.configureSampler(current);
                 runPreProcessors(pack.getPreProcessors());



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to