[jmeter] branch master updated: Add missing comma to CSV file listing expected dependencies
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 7acd031 Add missing comma to CSV file listing expected dependencies 7acd031 is described below commit 7acd03138abc9946b70d32ef74b4fb23db0c922a Author: Felix Schumacher AuthorDate: Sat Jan 9 19:00:24 2021 +0100 Add missing comma to CSV file listing expected dependencies --- src/dist/src/dist/expected_release_jars.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 9cbd10e..a9943ff 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -62,7 +62,7 @@ 220475,jodd-lagarto-5.0.13.jar 19858,jodd-log-5.0.13.jar 26047,jodd-props-5.0.13.jar -223186 json-path-2.4.0.jar +223186,json-path-2.4.0.jar 120316,json-smart-2.3.jar 393851,jsoup-1.13.1.jar 249924,jtidy-r938.jar
[jmeter] 02/02: Ignore SocketTimeoutException on BinaryTCPClientImpl, when no EOM Byte is set
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 0ee07764cab6cc603d26c5ec79957aeaeab1
Author: Felix Schumacher
AuthorDate: Wed Dec 30 12:36:51 2020 +0100
Ignore SocketTimeoutException on BinaryTCPClientImpl, when no EOM Byte is
set
Bugzilla Id: 65034
---
.../protocol/tcp/sampler/BinaryTCPClientImpl.java | 18 --
xdocs/changes.xml | 3 +++
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git
a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
index 2971aab..7965271 100644
---
a/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
+++
b/src/protocol/tcp/src/main/java/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.SocketTimeoutException;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
@@ -133,15 +134,20 @@ public class BinaryTCPClientImpl extends
AbstractTCPClient {
break;
}
}
-
-final String hexString =
JOrphanUtils.baToHexString(w.toByteArray());
-if(log.isDebugEnabled()) {
-log.debug("Read: " + w.size() + "\n" + hexString);
+} catch (SocketTimeoutException e) {
+if (useEolByte) {
+throw new ReadException("Socket timed out while looking for
EOM", e,
+JOrphanUtils.baToHexString(w.toByteArray()));
}
-return hexString;
+log.debug("Ignoring SocketTimeoutException, as we are not looking
for EOM", e);
} catch (IOException e) {
-throw new ReadException("", e,
JOrphanUtils.baToHexString(w.toByteArray()));
+throw new ReadException("Problems while trying to read", e,
JOrphanUtils.baToHexString(w.toByteArray()));
+}
+final String hexString = JOrphanUtils.baToHexString(w.toByteArray());
+if(log.isDebugEnabled()) {
+log.debug("Read: {}\n{}", w.size(), hexString);
}
+return hexString;
}
}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index f39d905..6b65c62 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -148,6 +148,9 @@ Summary
Other Samplers
+ 65034Ignore SocketTimeoutException on
BinaryTCPClientImpl, when no EOM Byte is set. Regression
+ introduced by commit c190641e4f0474a34a366a72364b0a8dd25bfc81 which fixed
52104. That bug was bout handling
+ the case of waiting for an EOM.
Controllers
[jmeter] 01/02: Correct the expected JAR for json-path 2.4.0
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 5bd92a66d49bbd63e09dfc9b2febc5d83443ad6e Author: Felix Schumacher AuthorDate: Sat Jan 9 18:43:34 2021 +0100 Correct the expected JAR for json-path 2.4.0 --- src/dist/src/dist/expected_release_jars.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 099c7db..9cbd10e 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -62,7 +62,7 @@ 220475,jodd-lagarto-5.0.13.jar 19858,jodd-log-5.0.13.jar 26047,jodd-props-5.0.13.jar -231720,json-path-2.5.0.jar +223186 json-path-2.4.0.jar 120316,json-smart-2.3.jar 393851,jsoup-1.13.1.jar 249924,jtidy-r938.jar
[jmeter] branch master updated (94c8ffe -> 0ee0999)
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 94c8ffe Revert json-path to version 2.4.0 new 5bd92a6 Correct the expected JAR for json-path 2.4.0 new 0ee0999 Ignore SocketTimeoutException on BinaryTCPClientImpl, when no EOM Byte is set 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: src/dist/src/dist/expected_release_jars.csv| 2 +- .../protocol/tcp/sampler/BinaryTCPClientImpl.java | 18 -- xdocs/changes.xml | 3 +++ 3 files changed, 16 insertions(+), 7 deletions(-)
[jmeter] branch master updated: Revert json-path to version 2.4.0
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 94c8ffe Revert json-path to version 2.4.0 94c8ffe is described below commit 94c8ffedde95fb16eb2da39c90e51233a82b61b7 Author: Felix Schumacher AuthorDate: Sat Jan 9 18:30:52 2021 +0100 Revert json-path to version 2.4.0 The newer version 2.5.0 has a bug https://github.com/json-path/JsonPath/issues/658 which surfaces when using regexes in the expressions. Bugzilla Id: 65053 --- gradle.properties | 2 +- xdocs/changes.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 516f214..f9f3402 100644 --- a/gradle.properties +++ b/gradle.properties @@ -100,7 +100,7 @@ jdom.version=1.1.3 jmespath-core.version=0.5.0 jmespath-jackson.version=0.5.0 jodd.version=5.0.13 -json-path.version=2.5.0 +json-path.version=2.4.0 json-smart.version=2.3 jsoup.version=1.13.1 jtidy.version=r938 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index e3142a9..f39d905 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -125,7 +125,6 @@ Summary Updated commons-io to 2.8.0 (from 2.7) Updated commons-net to 3.7.2 (from 3.7) Updated jackson to 2.10.5 (from 2.10.3) -Updated json-path to 2.5.0 (from 2.4.0) Updated junit to 4.13.1 (from 4.13) Updated ph-commons to 9.5.1 (from 9.4.1) Updated ph-css to 6.2.3 (from 6.2.1)
[jmeter] branch master updated: Avoid breaking JMeter due to a broken plugin classpath
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 6ff05cc Avoid breaking JMeter due to a broken plugin classpath
6ff05cc is described below
commit 6ff05cc5468664398bb4c75bc67cdb320a6b61ca
Author: pmouawad
AuthorDate: Sat Jan 9 17:54:06 2021 +0100
Avoid breaking JMeter due to a broken plugin classpath
---
.../src/main/java/org/apache/jmeter/visualizers/RequestPanel.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
index 54ccb5d..ac3a6a0 100644
---
a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
+++
b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
@@ -71,8 +71,13 @@ public class RequestPanel {
} else {
listRequestView.add(requestView);
}
+}
+catch (NoClassDefFoundError e) {
+log.error("Exception registering implementation: [{}] of
interface: [{}], a dependency used by the plugin class is missing",
+clazz, RequestView.class, e);
} catch (Exception e) {
-log.warn("Error in load result render: {}", clazz, e); //
$NON-NLS-1$
+log.error("Exception registering implementation: [{}] of
interface: [{}], a jar is probably missing",
+clazz, RequestView.class, e);
}
}
// place raw tab in first position (first tab)
[jmeter] branch master updated: Move XPath (1 & 2) extractors after JSON as it's a more frequent format.
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 2e4b453 Move XPath (1 & 2) extractors after JSON as it's a more frequent format. 2e4b453 is described below commit 2e4b453f2a90073607c8f3b6d1f48ff8f754495d Author: pmouawad AuthorDate: Sat Jan 9 17:52:08 2021 +0100 Move XPath (1 & 2) extractors after JSON as it's a more frequent format. --- bin/jmeter.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/jmeter.properties b/bin/jmeter.properties index c774e53..4953cbd 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -1180,7 +1180,7 @@ cookies=cookies # Note full class names should be used for non JMeter core renderers # For JMeter core renderers, class names start with '.' and are automatically # prefixed with org.apache.jmeter.visualizers -view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundaryExtractor,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsXPath2,org.apache.jmeter.extractor.json.render.RenderAsJsonRenderer,org.apache.jmeter.extractor.json.render.RenderAsJmesPathRenderer,.RenderAsHTML,.RenderAsHTMLFormatted,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML +view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundaryExtractor,.RenderAsCssJQuery,org.apache.jmeter.extractor.json.render.RenderAsJsonRenderer,.RenderAsXPath2,org.apache.jmeter.extractor.json.render.RenderAsJmesPathRenderer,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLFormatted,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML # Maximum number of results in the results tree # Set to 0 to store all results (might consume a lot of memory)
[jmeter] branch master updated: XPath2 Tester and JSON JMESPath Tester are missing in view.results.tree.renderers_order property
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 14ba786 XPath2 Tester and JSON JMESPath Tester are missing in view.results.tree.renderers_order property 14ba786 is described below commit 14ba78644ad09020ab9e39fe8104aa5283f4146b Author: Felix Schumacher AuthorDate: Sat Jan 9 16:16:18 2021 +0100 XPath2 Tester and JSON JMESPath Tester are missing in view.results.tree.renderers_order property Bugzilla Id: 65052 --- bin/jmeter.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/jmeter.properties b/bin/jmeter.properties index 8b3a430..c774e53 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -1180,7 +1180,7 @@ cookies=cookies # Note full class names should be used for non JMeter core renderers # For JMeter core renderers, class names start with '.' and are automatically # prefixed with org.apache.jmeter.visualizers -view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundaryExtractor,.RenderAsCssJQuery,.RenderAsXPath,org.apache.jmeter.extractor.json.render.RenderAsJsonRenderer,.RenderAsHTML,.RenderAsHTMLFormatted,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML +view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundaryExtractor,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsXPath2,org.apache.jmeter.extractor.json.render.RenderAsJsonRenderer,org.apache.jmeter.extractor.json.render.RenderAsJmesPathRenderer,.RenderAsHTML,.RenderAsHTMLFormatted,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML # Maximum number of results in the results tree # Set to 0 to store all results (might consume a lot of memory) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 6dba1de..e3142a9 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -158,6 +158,7 @@ Summary Listeners 64821When importing XML formatted jtl files, sub samplers will get renamed + 65052XPath2 Tester and JSON JMESPath Tester are missing in view.results.tree.renderers_order property Timers, Assertions, Config, Pre- & Post-Processors
