Author: fschumacher
Date: Mon Feb 12 16:25:32 2018
New Revision: 1824007
URL: http://svn.apache.org/viewvc?rev=1824007&view=rev
Log:
Simplify logic (re-arrange it)
Part of #356 on Github. Contributed by Graham Russell (graham at ham1.co.uk)
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=1824007&r1=1824006&r2=1824007&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
Mon Feb 12 16:25:32 2018
@@ -153,12 +153,7 @@ public class ModuleController extends Ge
* @return true if replacement occurred at the time method is called
*/
private boolean hasReplacementOccured() {
- if(GuiPackage.getInstance() != null) {
- // GUI Mode
- return isRunningVersion();
- } else {
- return true;
- }
+ return GuiPackage.getInstance() == null || isRunningVersion();
}
private void traverse(JMeterTreeNode node, List<?> nodePath, int level) {
