From c1084fbc21f137f6a13fc01d96c7ac711557b4ac Mon Sep 17 00:00:00 2001 From: David <3dgiordano@gmail.com> Date: Wed, 22 Jan 2025 16:12:07 -0300 Subject: [PATCH] Allow to run on JMeter lower than 5.2 --- .../jmeter/threads/AbstractThreadStarter.java | 12 +++++++++++- .../com/blazemeter/jmeter/threads/DynamicThread.java | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/AbstractThreadStarter.java b/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/AbstractThreadStarter.java index bb83ae48f..348815d8b 100644 --- a/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/AbstractThreadStarter.java +++ b/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/AbstractThreadStarter.java @@ -16,6 +16,10 @@ public abstract class AbstractThreadStarter extends Thread { private static final Logger log = LoggerFactory.getLogger(AbstractThreadStarter.class); + private static final String[] jmeterVersion = + JMeterUtils.getJMeterVersion().split(" ")[0].split("\\.", 3); + private static final int JMETER_VERSION_MAJOR = Integer.parseInt(jmeterVersion[0]); + private static final int JMETER_VERSION_MINOR = Integer.parseInt(jmeterVersion[1]); protected final ListenerNotifier notifier; protected final ListedHashTree threadGroupTree; protected final StandardJMeterEngine engine; @@ -59,7 +63,13 @@ protected DynamicThread makeThread(long threadIndex) { boolean onErrorStopTestNow = owner.getOnErrorStopTestNow(); boolean onErrorStopThread = owner.getOnErrorStopThread(); boolean onErrorStartNextLoop = owner.getOnErrorStartNextLoop(); - final DynamicThread jmeterThread = new DynamicThread(treeClone, this.owner, notifier, owner.getSameUser()); + DynamicThread jmeterThread; + if (JMETER_VERSION_MAJOR >= 5 && JMETER_VERSION_MINOR >=2) { + jmeterThread = + new DynamicThread(treeClone, this.owner, notifier, owner.getSameUser()); + } else { + jmeterThread = new DynamicThread(treeClone, this.owner, notifier); + } jmeterThread.setThreadNum((int) threadIndex); jmeterThread.setThreadGroup(this.owner); jmeterThread.setInitialContext(context); diff --git a/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/DynamicThread.java b/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/DynamicThread.java index 11077e3ba..e63372e95 100644 --- a/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/DynamicThread.java +++ b/plugins/casutg/src/main/java/com/blazemeter/jmeter/threads/DynamicThread.java @@ -14,6 +14,9 @@ public DynamicThread(HashTree test, JMeterThreadMonitor monitor, ListenerNotifie super(test, monitor, note, isSameUserOnNextIteration); } + public DynamicThread(HashTree test, JMeterThreadMonitor monitor, ListenerNotifier note) { + super(test, monitor, note); + } public void setOSThread(Thread OSThread) { this.osThread = OSThread; }