jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1720685 - in /jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/engine/StandardJMeterEngine.java src/core/org/apache/jmeter/threads/JMeterThread.java xdocs/changes.xml
Date Thu, 17 Dec 2015 22:28:07 GMT
Author: pmouawad
Date: Thu Dec 17 22:28:07 2015
New Revision: 1720685

URL: http://svn.apache.org/viewvc?rev=1720685&view=rev
Log:
Bug 58728 - Drop old behavioural properties
Bugzilla Id: 58728

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
    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=1720685&r1=1720684&r2=1720685&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Thu Dec 17 22:28:07 2015
@@ -1030,22 +1030,11 @@ beanshell.server.file=../extras/startup.
 # If you want to use Nashorn on JDK8, set this property to false
 #javascript.use_rhino=true
 
-# (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
-#jmeterthread.reversePostProcessors=true
-
 # (2.14) JMeterThread behaviour has changed: it now implements sampleStarted/sampleStopped
 # This is necessary for the test element Sample Timeout
 # Uncomment the following line to revert to the original behaviour (Sample Timeout will no
longer work)
 #JMeterThread.sampleStarted=false
 
-# (2.2) StandardJMeterEngine behaviour has been changed to notify the listeners after
-# the running version is enabled. This is so they can access variables. 
-# In case this causes problems, the previous behaviour can be restored by uncommenting
-# the following line.
-#jmeterengine.startlistenerslater=false
-
 # Number of milliseconds to wait for a thread to stop
 #jmeterengine.threadstop.wait=5000
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=1720685&r1=1720684&r2=1720685&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Thu Dec 17 22:28:07
2015
@@ -32,8 +32,8 @@ import org.apache.jmeter.samplers.Sample
 import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.testbeans.TestBeanHelper;
 import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.testelement.TestStateListener;
 import org.apache.jmeter.threads.AbstractThreadGroup;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.ListenerNotifier;
@@ -59,16 +59,6 @@ public class StandardJMeterEngine implem
     private static final boolean exitAfterTest =
         JMeterUtils.getPropDefault("server.exitaftertest", false);  // $NON-NLS-1$
 
-    private static final boolean startListenersLater =
-        JMeterUtils.getPropDefault("jmeterengine.startlistenerslater", true); // $NON-NLS-1$
-
-    static {
-        if (startListenersLater){
-            log.info("Listeners will be started after enabling running version");
-            log.info("To revert to the earlier behaviour, define jmeterengine.startlistenerslater=false");
-        }
-    }
-
     // Allow engine and threads to be stopped from outside a thread
     // e.g. from beanshell server
     // Assumes that there is only one instance of the engine
@@ -331,9 +321,8 @@ public class StandardJMeterEngine implem
         testListeners.getSearchResults().addAll(testList);
         testList.clear(); // no longer needed
 
-        if (!startListenersLater ) { notifyTestListenersOfStart(testListeners); }
         test.traverse(new TurnElementsOn());
-        if (startListenersLater) { notifyTestListenersOfStart(testListeners); }
+        notifyTestListenersOfStart(testListeners);
 
         List<?> testLevelElements = new LinkedList<>(test.list(test.getArray()[0]));
         removeThreadGroups(testLevelElements);

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=1720685&r1=1720684&r2=1720685&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java Thu Dec 17 22:28:07
2015
@@ -21,7 +21,6 @@ package org.apache.jmeter.threads;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -227,21 +226,6 @@ public class JMeterThread implements Run
         this.threadName = threadName;
     }
 
-    /*
-     * See below for reason for this change. Just in case this causes problems,
-     * allow the change to be backed out
-     */
-    private static final boolean reversePostProcessors =
-        JMeterUtils.getPropDefault("jmeterthread.reversePostProcessors", false); // $NON-NLS-1$
-
-    static {
-        if (reversePostProcessors) {
-            log.info("Running PostProcessors in reverse order");
-        } else {
-            log.info("Running PostProcessors in forward order");
-        }
-    }
-
     @Override
     public void run() {
         // threadContext is not thread-safe, so keep within thread
@@ -777,19 +761,9 @@ public class JMeterThread implements Run
 
     @SuppressWarnings("deprecation") // OK to call TestBeanHelper.prepare()
     private void runPostProcessors(List<PostProcessor> extractors) {
-        ListIterator<PostProcessor> iter;
-        if (reversePostProcessors) {// Original (rather odd) behaviour
-            iter = extractors.listIterator(extractors.size());// start at the end
-            while (iter.hasPrevious()) {
-                PostProcessor ex = iter.previous();
-                TestBeanHelper.prepare((TestElement) ex);
-                ex.process();
-            }
-        } else {
-            for (PostProcessor ex : extractors) {
-                TestBeanHelper.prepare((TestElement) ex);
-                ex.process();
-            }
+        for (PostProcessor ex : extractors) {
+            TestBeanHelper.prepare((TestElement) ex);
+            ex.process();
         }
     }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1720685&r1=1720684&r2=1720685&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Dec 17 22:28:07 2015
@@ -79,7 +79,9 @@ Summary
     </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>Property <code>jmeterthread.startearlier parameter</code> has been
removed. See <bugzilla>58726</bugzilla></li>   
+    <li>Property <code>jmeterthread.startearlier</code> has been removed.
See <bugzilla>58726</bugzilla></li>   
+    <li>Property <code>jmeterengine.startlistenerslater</code> has been
removed. See <bugzilla>58728</bugzilla></li>   
+    <li>Property <code>jmeterthread.reversePostProcessors</code> has been
removed. See <bugzilla>58728</bugzilla></li>   
 </ul>
 
 <!-- =================== Improvements =================== -->
@@ -149,6 +151,7 @@ Summary
 <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>
+<li><bug>58728</bug>Drop old behavioural properties</li>
 </ul>
 <ch_section>Non-functional changes</ch_section>
 <ul>



Mime
View raw message