You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/24 20:03:54 UTC
[jmeter] branch master updated (4f5f0a3 -> bcfc1f7)
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.
from 4f5f0a3 Use parents javadoc implicitly
new 376a604 Remove Threadlocal JSONManager on thread exit
new 12206c5 Remove Threadlocal perThreadInt on thread exit
new bcfc1f7 Spacepolice
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jmeter/extractor/json/jsonpath/JSONPostProcessor.java | 2 +-
.../org/apache/jmeter/functions/IterationCounter.java | 15 +++++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
[jmeter] 01/03: Remove Threadlocal JSONManager on thread exit
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 376a60409d6eba63ea5dd9a8b2bf72637a0b6ddc
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 24 21:56:08 2019 +0200
Remove Threadlocal JSONManager on thread exit
---
.../org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
index e129145..291b2d8 100644
--- a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
+++ b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONPostProcessor.java
@@ -239,7 +239,7 @@ public class JSONPostProcessor
@Override
public void threadFinished() {
- localMatcher.get().reset();
+ localMatcher.remove();
}
public void setMatchNumbers(String matchNumber) {
[jmeter] 02/03: Remove Threadlocal perThreadInt on thread exit
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 12206c5442083b34ace41b324f4b2ee7c6888504
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 24 21:59:35 2019 +0200
Remove Threadlocal perThreadInt on thread exit
---
.../java/org/apache/jmeter/functions/IterationCounter.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
index 88e396a..9134eec 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.jmeter.engine.util.CompoundVariable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
+import org.apache.jmeter.testelement.ThreadListener;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
@@ -34,7 +35,7 @@ import org.apache.jmeter.util.JMeterUtils;
* or globally.
* @since 1.X
*/
-public class IterationCounter extends AbstractFunction {
+public class IterationCounter extends AbstractFunction implements ThreadListener {
private static final List<String> desc = new LinkedList<>();
@@ -98,4 +99,14 @@ public class IterationCounter extends AbstractFunction {
public List<String> getArgumentDesc() {
return desc;
}
+
+ @Override
+ public void threadStarted() {
+ // Nothing to do on thread start
+ }
+
+ @Override
+ public void threadFinished() {
+ perThreadInt.remove();
+ }
}
[jmeter] 03/03: Spacepolice
Posted by fs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit bcfc1f7e18474b74910cd7a3c836a792b657e9ba
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Aug 24 22:00:32 2019 +0200
Spacepolice
---
.../src/main/java/org/apache/jmeter/functions/IterationCounter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
index 9134eec..cf8799b 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/IterationCounter.java
@@ -62,7 +62,7 @@ public class IterationCounter extends AbstractFunction implements ThreadListener
boolean perThread = Boolean.parseBoolean(((CompoundVariable) variables[0]).execute());
String varName = ""; //$NON-NLS-1$
- if (variables.length >=2) {// Ensure variable has been provided
+ if (variables.length >= 2) {// Ensure variable has been provided
varName = ((CompoundVariable) variables[1]).execute().trim();
}