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 20ba58d Fall back to JMETER_HOME on startup to detect JMeter's
installation directory
20ba58d is described below
commit 20ba58d0c0273d1857a3c1b614d32617faf7f7ce
Author: Felix Schumacher <[email protected]>
AuthorDate: Fri Aug 21 17:41:58 2020 +0200
Fall back to JMETER_HOME on startup to detect JMeter's installation
directory
Bugzilla Id: 64680
---
src/launcher/src/main/java/org/apache/jmeter/NewDriver.java | 3 +++
xdocs/changes.xml | 1 +
2 files changed, 4 insertions(+)
diff --git a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
index d7e62ed..a662b79 100644
--- a/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
+++ b/src/launcher/src/main/java/org/apache/jmeter/NewDriver.java
@@ -85,6 +85,9 @@ public final class NewDriver {
tmpDir = userDir.getAbsoluteFile().getParent();
}
}
+ if (tmpDir == null) {
+ tmpDir = System.getenv("JMETER_HOME");
+ }
JMETER_INSTALLATION_DIRECTORY=tmpDir;
/*
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 0efdc28..08d748c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -118,6 +118,7 @@ applications when JMeter is starting up.</p>
<li><bug>64446</bug>Better parse curl commands with backslash at line
endings and support <code>PUT</code> method with data arguments</li>
<li><pr>599</pr>Ensure all buttons added to the toolbar behave/look
consistently. Contributed by Jannis Weis</li>
<li><bug>64581</bug>Allow SampleResult#setIgnore to influence behaviour on
Sampler Error</li>
+ <li><bug>64680</bug>Fall back to <code>JMETER_HOME</code> on startup to
detect JMeter's installation directory</li>
</ul>
<ch_section>Non-functional changes</ch_section>
