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 2020/08/09 09:44:49 UTC
[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
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 6fa1735f86f734edfe1093e0edf6c9a336811430
Author: Felix Schumacher <fe...@internetallee.de>
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);
[jmeter] 02/02: Don't use toString here,
as it is not needed and target could be null
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 b64a68c2a9e331b2334b4dd3768829bb196ef947
Author: Felix Schumacher <fe...@internetallee.de>
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);
}
}