Author: pmouawad
Date: Tue Nov 6 22:18:40 2018
New Revision: 1845973
URL: http://svn.apache.org/viewvc?rev=1845973&view=rev
Log:
SHA1 is alias for SHA-1, but SHA-1 would work in most scenario
Contributed by pacoxu
This closes #411
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1845973&r1=1845972&r2=1845973&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Tue Nov 6
22:18:40 2018
@@ -203,7 +203,7 @@ public class SaveService {
private static String getChecksumForPropertiesFile()
throws NoSuchAlgorithmException, IOException {
- MessageDigest md = MessageDigest.getInstance("SHA1");
+ MessageDigest md = MessageDigest.getInstance("SHA-1");
File saveServiceFile = getSaveServiceFile();
try (BufferedReader reader =
Files.newBufferedReader(saveServiceFile.toPath(),
Charset.defaultCharset())) {
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1845973&r1=1845972&r2=1845973&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Nov 6 22:18:40 2018
@@ -120,6 +120,7 @@ of previous time slot as a base. Startin
<li><bug>62744</bug>Upgrade jquery to version 3.3.1, jquery-ui to 1.12.1,
bootstrap to 3.3.7</li>
<li><bug>62257</bug><pr>401</pr>Expand/Collapse short key
<keysym>-</keysym> (minus sign) on numpad doesn't work. Contributed by Ori
Marko (orimarko at gmail.com)</li>
<li><bug>62752</bug>Add to Documentation: <code>ctx.getThreadNum()</code>
is zero-based while <code>${__threadNum}</code> is one-based</li>
+ <li><pr>411</pr>Use <code>SHA-1</code> instead of <code>SHA1</code> in
<code>org.apache.jmeter.save.SaveService</code>. Contributed by Paco (paco.xu
at daocloud.io)</li>
</ul>
<ch_section>Non-functional changes</ch_section>
@@ -209,6 +210,7 @@ of previous time slot as a base. Startin
<li>刘士 (liushilive at outlook.com)</li>
<li>Michael Pavlov (michael.paulau at gmail.com)</li>
<li>Ori Marko (orimarko at gmail.com)</li>
+ <li>Paco (paco.xu at daocloud.io)</li>
</ul>
<p>We also thank bug reporters who helped us improve JMeter.</p>
<ul>
