[jmeter] branch master updated: Correct typo: ley -> key
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 The following commit(s) were added to refs/heads/master by this push: new a1bc13f Correct typo: ley -> key a1bc13f is described below commit a1bc13f1d626fc9d58bb9d5124a72bd07237374d Author: Felix Schumacher AuthorDate: Sun Aug 9 19:48:16 2020 +0200 Correct typo: ley -> key --- checksum.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checksum.xml b/checksum.xml index 1d62d5a..b8c6ea2 100644 --- a/checksum.xml +++ b/checksum.xml @@ -133,7 +133,7 @@ - +
[jmeter] branch master updated: Add missing key id for org.json:json
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 The following commit(s) were added to refs/heads/master by this push: new 906918b Add missing key id for org.json:json 906918b is described below commit 906918b8c946ff22d0c8dd1ac1090869ce31266d Author: Felix Schumacher AuthorDate: Sun Aug 9 19:06:30 2020 +0200 Add missing key id for org.json:json --- checksum.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/checksum.xml b/checksum.xml index 0804953..1d62d5a 100644 --- a/checksum.xml +++ b/checksum.xml @@ -133,6 +133,7 @@ +
[jmeter] branch master updated: Add missing key id for spotbugs
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 The following commit(s) were added to refs/heads/master by this push: new 80718ad Add missing key id for spotbugs 80718ad is described below commit 80718ad6b90c062807989551e05ffef546755a09 Author: Felix Schumacher AuthorDate: Sun Aug 9 18:56:30 2020 +0200 Add missing key id for spotbugs --- checksum.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/checksum.xml b/checksum.xml index b51f544..0804953 100644 --- a/checksum.xml +++ b/checksum.xml @@ -14,6 +14,7 @@ +
[jmeter] branch master updated: Update utility jars spotbugs and checksum
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 The following commit(s) were added to refs/heads/master by this push: new 9d21839 Update utility jars spotbugs and checksum 9d21839 is described below commit 9d21839314254a54e673c0d1d861b5bd8bfa18f1 Author: Felix Schumacher AuthorDate: Sun Aug 9 18:41:05 2020 +0200 Update utility jars spotbugs and checksum --- checksum.xml | 4 +++- config/checkstyle/checkstyle.xml | 10 ++ gradle.properties| 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/checksum.xml b/checksum.xml index 8222307..b51f544 100644 --- a/checksum.xml +++ b/checksum.xml @@ -19,6 +19,7 @@ + @@ -39,6 +40,7 @@ + @@ -77,8 +79,8 @@ - + diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index e82b6bb..75128be 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -68,6 +68,12 @@ + + + + + + @@ -178,10 +184,6 @@ - - - - diff --git a/gradle.properties b/gradle.properties index 0ff1fa2..568ca11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,9 +28,9 @@ kotlin.parallel.tasks.in.project=true jmeter.version=5.3.1 # Tools -checkstyle.version=8.22 +checkstyle.version=8.35 jacoco.version=0.8.5 -spotbugs.version=3.1.12 +spotbugs.version=4.1.1 velocity.version=1.7 # Plugins
[jmeter] 01/02: Seems to be the wrong path for libs, so remove it again
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 4159674b211d59949e16b50dac05d2f1aad5a708
Author: Felix Schumacher
AuthorDate: Sun Aug 9 18:02:51 2020 +0200
Seems to be the wrong path for libs, so remove it again
---
build.gradle.kts | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index d429ff2..4f0c605 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -185,7 +185,6 @@ sonarqube {
property("sonar.links.ci",
"https://builds.apache.org/job/JMeter-trunk/;)
property("sonar.links.scm", "https://jmeter.apache.org/svnindex.html;)
property("sonar.links.issue", "https://jmeter.apache.org/issues.html;)
-property("sonar.java.libraries", "./lib/**/*.jar")
}
}
[jmeter] 02/02: Use badge for new jenkins instance
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 f381cda57564270d7d81298d5d0e1944dc2622f9 Author: Felix Schumacher AuthorDate: Sun Aug 9 18:03:26 2020 +0200 Use badge for new jenkins instance --- xdocs/nightly.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/nightly.xml b/xdocs/nightly.xml index 28e9080..925198d 100644 --- a/xdocs/nightly.xml +++ b/xdocs/nightly.xml @@ -36,7 +36,7 @@ These builds should not be used in production. Last Build status on Jenkins - + Last Quality Report on Sonar https://sonarcloud.io/dashboard?id=JMeter;>Apache JMeter quality report
[jmeter] branch master updated (eeb5258 -> f381cda)
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 eeb5258 Use correct path for jars new 4159674 Seems to be the wrong path for libs, so remove it again new f381cda Use badge for new jenkins instance The 2 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: build.gradle.kts | 1 - xdocs/nightly.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
[jmeter] branch master updated: Use correct path for jars
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
The following commit(s) were added to refs/heads/master by this push:
new eeb5258 Use correct path for jars
eeb5258 is described below
commit eeb52588b6d4d0930e321b32718c2349ef053871
Author: Felix Schumacher
AuthorDate: Sun Aug 9 17:22:56 2020 +0200
Use correct path for jars
---
build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index df52b37..d429ff2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -185,7 +185,7 @@ sonarqube {
property("sonar.links.ci",
"https://builds.apache.org/job/JMeter-trunk/;)
property("sonar.links.scm", "https://jmeter.apache.org/svnindex.html;)
property("sonar.links.issue", "https://jmeter.apache.org/issues.html;)
-property("sonar.java.libraries", "./libs/**/*.jar")
+property("sonar.java.libraries", "./lib/**/*.jar")
}
}
[jmeter] branch master updated: No need to call toString on argument to message format
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
The following commit(s) were added to refs/heads/master by this push:
new 2238e7c No need to call toString on argument to message format
2238e7c is described below
commit 2238e7c2c766ad9498403108ea7c00dd048fdcf8
Author: Felix Schumacher
AuthorDate: Sun Aug 9 16:57:42 2020 +0200
No need to call toString on argument to message format
---
.../src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 6e8ef64..2b3b5af 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -94,7 +94,7 @@ public class HtmlReportGenerator {
"generate_report_ui.generation_timeout", COMMAND_TIMEOUT,
commandExecutionOutput, e);
} catch (InterruptedException | IOException e) {
errorMessageList.add(MessageFormat.format(JMeterUtils.getResString("generate_report_ui.html_report_unknown_error"),
-e.getMessage(), commandExecutionOutput.toString()));
+e.getMessage(), commandExecutionOutput));
LOGGER.error("Error during HTML report generation, executing {}",
commandExecutionOutput, e);
if (e instanceof InterruptedException) {
Thread.currentThread().interrupt();
[jmeter] branch master updated (9df1bfe -> 5671589)
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 9df1bfe Make sonarqube a bit happier and trigger a new build new d3a09ce Use Map#computeIfAbsent to simplify code new 5671589 Change to new jenkins nodes and correct filename-structure of nightlies The 2 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: .../org/apache/jmeter/extractor/json/jsonpath/JSONManager.java | 8 +--- xdocs/nightly.xml | 10 +- 2 files changed, 6 insertions(+), 12 deletions(-)
[jmeter] 01/02: Use Map#computeIfAbsent to simplify code
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 d3a09cecc977e902154657d0a5281bab90d8fbac
Author: Felix Schumacher
AuthorDate: Sun Aug 9 14:12:03 2020 +0200
Use Map#computeIfAbsent to simplify code
---
.../org/apache/jmeter/extractor/json/jsonpath/JSONManager.java| 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
index 4905d79..03a4ee5 100644
---
a/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
+++
b/src/components/src/main/java/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
@@ -53,13 +53,7 @@ public class JSONManager {
private final Map expressionToJsonPath = new
HashMap<>(2);
private JsonPath getJsonPath(String jsonPathExpression) {
-JsonPath jsonPath = expressionToJsonPath.get(jsonPathExpression);
-if (jsonPath == null) {
-jsonPath = JsonPath.compile(jsonPathExpression);
-expressionToJsonPath.put(jsonPathExpression, jsonPath);
-}
-
-return jsonPath;
+return expressionToJsonPath.computeIfAbsent(jsonPathExpression,
JsonPath::compile);
}
public void reset() {
[jmeter] 02/02: Change to new jenkins nodes and correct filename-structure of nightlies
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 5671589eb24cfb4f93e6cc8e897ff71ab4b3901b
Author: Felix Schumacher
AuthorDate: Sun Aug 9 14:19:06 2020 +0200
Change to new jenkins nodes and correct filename-structure of nightlies
---
xdocs/nightly.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/xdocs/nightly.xml b/xdocs/nightly.xml
index 79f9889..28e9080 100644
--- a/xdocs/nightly.xml
+++ b/xdocs/nightly.xml
@@ -45,7 +45,7 @@
JMeter CI builds are currently run by Jenkins and Buildbot
These are located at:
-https://builds.apache.org/job/JMeter-trunk/lastSuccessfulBuild/artifact/src/dist/build/distributions/;>Last
Successful Jenkins build for JMeter-trunk
+https://ci-builds.apache.org/job/JMeter/job/JMeter-trunk/lastSuccessfulBuild/artifact/src/dist/build/distributions/;>Last
Successful Jenkins build for JMeter-trunk
http://ci.apache.org/projects/jmeter/nightlies/;>Buildbot
nightly builds for JMeter-trunk
https://repository.apache.org/content/repositories/snapshots/org/apache/jmeter/;>Maven
Snapshots (Buildbot nightly builds)
@@ -55,10 +55,10 @@
JMeter is distributed as a set of zip (or tar-gz) archive files as are the
released versions.
You can find the bundles:
-apache-jmeter-{SVN revision}.zip - Bundle in ZIP format
-apache-jmeter-{SVN revision}.tgz - Bundle in TAR GZIP format
-apache-jmeter-{SVN revision}_src.zip - Sources in ZIP format
-apache-jmeter-{SVN revision}_src.tgz - Sources in TAR GZIP format
+{git revision}/apache-jmeter-{version}.zip - Bundle in ZIP format
+{git revision}/apache-jmeter-{version}.tgz - Bundle in TAR GZIP format
+{git revision}/apache-jmeter-{version}_src.zip - Sources in ZIP format
+{git revision}/apache-jmeter-{version}_src.tgz - Sources in TAR GZIP
format
For each file you will also find a hash (MD5, SHA) that allows you to test its
integrity.
[jmeter] branch master updated: Make sonarqube a bit happier and trigger a new build
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
The following commit(s) were added to refs/heads/master by this push:
new 9df1bfe Make sonarqube a bit happier and trigger a new build
9df1bfe is described below
commit 9df1bfee31bb4b783635d0fa3dd5af881271b4d7
Author: Felix Schumacher
AuthorDate: Sun Aug 9 13:46:25 2020 +0200
Make sonarqube a bit happier and trigger a new build
---
.../apache/jmeter/extractor/BoundaryExtractor.java | 35 --
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
index 26f6c9a..f11334e 100644
---
a/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
+++
b/src/components/src/main/java/org/apache/jmeter/extractor/BoundaryExtractor.java
@@ -203,19 +203,36 @@ public class BoundaryExtractor extends
AbstractScopedTestElement implements Post
}
private String getInputString(SampleResult result) {
-String inputString = useUrl() ? result.getUrlAsString() // Bug 39707
-: useHeaders() ? result.getResponseHeaders()
-: useRequestHeaders() ? result.getRequestHeaders()
-: useCode() ? result.getResponseCode() // Bug 43451
-: useMessage() ? result.getResponseMessage() // Bug 43451
-: useUnescapedBody() ?
StringEscapeUtils.unescapeHtml4(result.getResponseDataAsString())
-: useBodyAsDocument() ?
Document.getTextFromDocument(result.getResponseData())
-: result.getResponseDataAsString() // Bug 36898
-;
+String inputString = chosenInput(result);
log.debug("Input = '{}'", inputString);
return inputString;
}
+private String chosenInput(SampleResult result) {
+if (useUrl()) {
+return result.getUrlAsString(); // Bug 39707;
+}
+if (useHeaders()) {
+return result.getResponseHeaders();
+}
+if (useRequestHeaders()) {
+return result.getRequestHeaders();
+}
+if (useCode()) {
+return result.getResponseCode(); // Bug 43451
+}
+if (useMessage()) {
+return result.getResponseMessage(); // Bug 43451
+}
+if (useUnescapedBody()) {
+return
StringEscapeUtils.unescapeHtml4(result.getResponseDataAsString());
+}
+if (useBodyAsDocument()) {
+return Document.getTextFromDocument(result.getResponseData());
+}
+return result.getResponseDataAsString(); // Bug 36898
+}
+
private List extract(
String leftBoundary, String rightBoundary, int matchNumber,
Stream previousResults) {
boolean allItems = matchNumber <= 0;
[jmeter] branch master updated: Use ThreadLocal.remove instead of set(null). It is safer
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
The following commit(s) were added to refs/heads/master by this push:
new 216a649 Use ThreadLocal.remove instead of set(null). It is safer
216a649 is described below
commit 216a6498c02494ba0f5b6e440c398dff3b34c845
Author: Felix Schumacher
AuthorDate: Sun Aug 9 13:05:38 2020 +0200
Use ThreadLocal.remove instead of set(null). It is safer
---
src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java
b/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java
index a80bd7c..f4ca272 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JsseSSLManager.java
@@ -188,7 +188,7 @@ public class JsseSSLManager extends SSLManager {
public void resetContext() {
if (!SHARED_SESSION_CONTEXT) {
log.debug("Clearing session context for current thread");
-this.threadlocal.set(null);
+this.threadlocal.remove();
}
}
[jmeter] branch master updated: Use format message placeholder instead of string concatenation, to make code clearer
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
The following commit(s) were added to refs/heads/master by this push:
new af3958b Use format message placeholder instead of string
concatenation, to make code clearer
af3958b is described below
commit af3958b3cd5172bc60ca2d3f440febf173f45f8e
Author: Felix Schumacher
AuthorDate: Sun Aug 9 12:20:02 2020 +0200
Use format message placeholder instead of string concatenation, to make
code clearer
---
.../src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
index ca2f5d6..d9c1a14 100644
---
a/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
+++
b/src/components/src/main/java/org/apache/jmeter/assertions/HTMLAssertion.java
@@ -121,9 +121,9 @@ public class HTMLAssertion extends AbstractTestElement
implements Serializable,
|| (!isErrorsOnly() && warningsAboveThreshold)) {
log.debug("Errors/warnings detected while parsing with tidy:
{}", errbuf);
result.setFailure(true);
-result.setFailureMessage(MessageFormat.format("Tidy Parser
errors: " + tidy.getParseErrors()
-+ " (allowed " + getErrorThreshold() + ") " + "Tidy
Parser warnings: "
-+ tidy.getParseWarnings() + " (allowed " +
getWarningThreshold() + ")", new Object[0]));
+result.setFailureMessage(MessageFormat.format(
+"Tidy Parser errors: {} (allowed {}) Tidy Parser
warnings: {} (allowed {})",
+tidy.getParseErrors(), getErrorThreshold(),
tidy.getParseWarnings(), getWarningThreshold()));
// return with an error
} else if (tidy.getParseErrors() > 0 || tidy.getParseWarnings() >
0) {
[jmeter] branch master updated: Don't use toString on format parameters and correct number of placeholders
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
The following commit(s) were added to refs/heads/master by this push:
new cf32f8e Don't use toString on format parameters and correct number of
placeholders
cf32f8e is described below
commit cf32f8eaf83363d2a46c798f17b4d44b7c985da5
Author: Felix Schumacher
AuthorDate: Sun Aug 9 12:07:38 2020 +0200
Don't use toString on format parameters and correct number of placeholders
---
.../java/org/apache/jmeter/gui/action/HtmlReportGenerator.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 41cf95f..6e8ef64 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -89,13 +89,13 @@ public class HtmlReportGenerator {
}
} catch (TimeoutException e) {
errorMessageList.add(MessageFormat.format(JMeterUtils.getResString("generate_report_ui.html_report_timeout_error"),
-COMMAND_TIMEOUT, e.getMessage(),
commandExecutionOutput.toString()));
-LOGGER.error("Report generation took more time than configured
timeout(Property {}={})",
-"generate_report_ui.generation_timeout", COMMAND_TIMEOUT,
commandExecutionOutput.toString(), e);
+COMMAND_TIMEOUT, e.getMessage(), commandExecutionOutput));
+LOGGER.error("Report generation took more time than configured
timeout (Property {}={}, command output=[{}])",
+"generate_report_ui.generation_timeout", COMMAND_TIMEOUT,
commandExecutionOutput, e);
} catch (InterruptedException | IOException e) {
errorMessageList.add(MessageFormat.format(JMeterUtils.getResString("generate_report_ui.html_report_unknown_error"),
e.getMessage(), commandExecutionOutput.toString()));
-LOGGER.error("Error during HTML report generation, executing {}",
commandExecutionOutput.toString(), e);
+LOGGER.error("Error during HTML report generation, executing {}",
commandExecutionOutput, e);
if (e instanceof InterruptedException) {
Thread.currentThread().interrupt();
}
[jmeter] 02/02: Don't use toString here, as it is not needed and target could be null
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 b64a68c2a9e331b2334b4dd3768829bb196ef947
Author: Felix Schumacher
AuthorDate: Sun Aug 9 11:33:43 2020 +0200
Don't use toString here, as it is not needed and target could be null
---
.../java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
index 5fb5255..96f37eb 100644
---
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
+++
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
@@ -631,7 +631,7 @@ public abstract class AbstractJDBCTestElement extends
AbstractTestElement implem
s.close();
}
} catch (SQLException e) {
-log.warn("Error closing Statement {}", s.toString(), e);
+log.warn("Error closing Statement {}", s, e);
}
}
[jmeter] branch master updated (81a6d67 -> b64a68c)
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 81a6d67 Exclude Javascript and JSON from parsing for charsets from forms by proxy new 6fa1735 Add ThreadGroup in the mix instead of duplicate condition new b64a68c Don't use toString here, as it is not needed and target could be null The 2 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: .../main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java | 3 ++- .../java/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
[jmeter] 01/02: Add ThreadGroup in the mix instead of duplicate condition
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 6fa1735f86f734edfe1093e0edf6c9a336811430
Author: Felix Schumacher
AuthorDate: Sun Aug 9 11:26:50 2020 +0200
Add ThreadGroup in the mix instead of duplicate condition
The other conditions are always using the dual components, so keep that
pattern
for the ThreadGroup <-> AbstractThreadGroupGui, too.
---
.../main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
index 6977e48..0ddd7bb 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/menu/StaticJMeterGUIComponent.java
@@ -41,6 +41,7 @@ import
org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.threads.ThreadGroup;
import org.apache.jmeter.threads.gui.AbstractThreadGroupGui;
import org.apache.jmeter.timers.Timer;
import org.apache.jmeter.timers.gui.AbstractTimerGui;
@@ -100,7 +101,7 @@ public class StaticJMeterGUIComponent implements
JMeterGUIComponent {
group = MenuFactory.SAMPLERS;
} else if (Timer.class.isAssignableFrom(c) ||
AbstractTimerGui.class.isAssignableFrom(c)) {
group = MenuFactory.TIMERS;
-} else if (AbstractThreadGroupGui.class.isAssignableFrom(c) ||
AbstractThreadGroupGui.class.isAssignableFrom(c)) {
+} else if (ThreadGroup.class.isAssignableFrom(c) ||
AbstractThreadGroupGui.class.isAssignableFrom(c)) {
group = MenuFactory.THREADS;
} else {
throw new IllegalArgumentException("Unknown group for class " + c);
