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/29 20:04:03 UTC
[jmeter] 13/13: Spacepolice
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 81ba16c2213c6af78a388a7c94a11474d20348a6
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Thu Aug 29 21:44:25 2019 +0200
Spacepolice
Closes #482 on github
---
src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java | 4 ++--
xdocs/changes.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index a4483f9..d3aecfe 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -527,11 +527,11 @@ public class JMeterUtils implements UnitTestManager {
}
resString = defaultValue;
}
- if (ignoreResources ){ // Special mode for debugging resource handling
+ if (ignoreResources) { // Special mode for debugging resource handling
return "["+key+"]";
}
} catch (MissingResourceException mre) { // NOSONAR We handle correctly exception
- if (ignoreResources ){ // Special mode for debugging resource handling
+ if (ignoreResources) { // Special mode for debugging resource handling
return "[?"+key+"?]";
}
if(defaultValue == null) {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index c06a068..130b8ea 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -205,7 +205,7 @@ to view the last release notes of version 5.1.1.
<li><bug>63394</bug>JMeter should fail with non-zero when test execution fails (due to missing test plan or other reason). Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
<li><bug>63464</bug>image/svg+xml is wrongly considered as binary</li>
<li><bug>63490</bug>At end of scheduler duration lots of Samplers gets executed at the same time</li>
- <li><pr>480</pr>Fix a few typos in comments and log messages. Based on patch by Anass Benomar (anassbenomar at gmail.com)</li>
+ <li><pr>480</pr><pr>482</pr>Fix a few typos in comments and log messages. Based on patch by Anass Benomar (anassbenomar at gmail.com)</li>
</ul>
<!-- =================== Thanks =================== -->