You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/12/13 15:20:48 UTC

svn commit: r1719801 - in /jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/threads/JMeterThread.java xdocs/changes.xml

Author: pmouawad
Date: Sun Dec 13 14:20:48 2015
New Revision: 1719801

URL: http://svn.apache.org/viewvc?rev=1719801&view=rev
Log:
Bug 58726 - Remove the jmeterthread.startearlier parameter
#resolve #58
Bugzilla Id: 58726

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1719801&r1=1719800&r2=1719801&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Dec 13 14:20:48 2015
@@ -1030,12 +1030,6 @@ beanshell.server.file=../extras/startup.
 # If you want to use Nashorn on JDK8, set this property to false
 #javascript.use_rhino=true
 
-# (2.0.3) JMeterThread behaviour has been changed to set the started flag before
-# the controllers are initialised. This is so controllers can access variables earlier. 
-# In case this causes problems, the previous behaviour can be restored by uncommenting
-# the following line.
-#jmeterthread.startearlier=false
-
 # (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

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1719801&r1=1719800&r2=1719801&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Sun Dec 13 14:20:48 2015
@@ -226,18 +226,10 @@ public class JMeterThread implements Run
      * 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 =
-        JMeterUtils.getPropDefault("jmeterthread.startearlier", true); // $NON-NLS-1$
-
     private static final boolean reversePostProcessors =
-        JMeterUtils.getPropDefault("jmeterthread.reversePostProcessors",false); // $NON-NLS-1$
+        JMeterUtils.getPropDefault("jmeterthread.reversePostProcessors", false); // $NON-NLS-1$
 
     static {
-        if (startEarlier) {
-            log.info("jmeterthread.startearlier=true (see jmeter.properties)");
-        } else {
-            log.info("jmeterthread.startearlier=false (see jmeter.properties)");
-        }
         if (reversePostProcessors) {
             log.info("Running PostProcessors in reverse order");
         } else {
@@ -551,15 +543,12 @@ public class JMeterThread implements Run
          * them to access the running values of functions and variables (however
          * it does not seem to help with the listeners)
          */
-        if (startEarlier) {
-            threadContext.setSamplingStarted(true);
-        }
+        threadContext.setSamplingStarted(true);
+        
         controller.initialize();
         IterationListener iterationListener = new IterationListener();
         controller.addIterationListener(iterationListener);
-        if (!startEarlier) {
-            threadContext.setSamplingStarted(true);
-        }
+
         threadStarted();
         return iterationListener;
     }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1719801&r1=1719800&r2=1719801&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Dec 13 14:20:48 2015
@@ -78,7 +78,8 @@ Summary
     Note in future versions, we will switch to Nashorn by default, so users are encouraged to report any issue related to broken code when using Nashorn instead of Rhino.
     </li>
     <li>Since version 2.14, JMS Publisher will reload contents of file if Message source is "From File" and the ""Filename" field changes (through variables usage for example)</li>
-    <li>org.apache.jmeter.gui.util.ButtonPanel has been removed, if you use it in your 3rd party plugin or custom development ensure you update your code. see <bugzill>58687</bugzill></li>   
+    <li>org.apache.jmeter.gui.util.ButtonPanel has been removed, if you use it in your 3rd party plugin or custom development ensure you update your code. See <bugzill>58687</bugzill></li>
+    <li>Property <code>jmeterthread.startearlier parameter</code> has been removed. See <bugzilla>58726</bugzilla></li>   
 </ul>
 
 <!-- =================== Improvements =================== -->
@@ -146,6 +147,7 @@ Summary
 <li><bug>58696</bug>Create Ant task to setup Eclipse project</li>
 <li><bug>58653</bug>New JMeter Dashboard/Report with Dynamic Graphs, Tables to help analyzing load test results. Developed by Ubik-Ingenierie and contributed by Decathlon S.A. and Ubik-Ingenierie / UbikLoadPack</li>
 <li><bug>58699</bug>Workbench changes neither saved nor prompted for saving upon close. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
+<li><bug>58726</bug>Remove the <code>jmeterthread.startearlier</code> parameter. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
 </ul>
 <ch_section>Non-functional changes</ch_section>
 <ul>