jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1811873 - in /jmeter/trunk: src/core/org/apache/jmeter/util/SSLManager.java xdocs/changes.xml
Date Wed, 11 Oct 2017 19:19:17 GMT
Author: pmouawad
Date: Wed Oct 11 19:19:17 2017
New Revision: 1811873

URL: http://svn.apache.org/viewvc?rev=1811873&view=rev
Log:
Warn empty truststore loading like empty keystore loading
Contributed by Vincent Herilier
This closes #316

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java?rev=1811873&r1=1811872&r2=1811873&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java Wed Oct 11 19:19:17 2017
@@ -228,7 +228,7 @@ public abstract class SSLManager {
                         log.info("Truststore loaded OK from file");
                     }
                 } else {
-                    log.info("Truststore file not found, loading empty truststore");
+                    log.warn("Truststore file not found, loading empty truststore");
                     this.trustStore.load(null, null);
                 }
             } catch (Exception e) {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1811873&r1=1811872&r2=1811873&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Oct 11 19:19:17 2017
@@ -80,6 +80,7 @@ Summary
 
 <h3>HTTP Samplers and Test Script Recorder</h3>
 <ul>
+    <li><pr>316</pr>Warn about empty truststore loading. Contributed by
Vincent Herilier (https://github.com/vherilier)</li>
 </ul>
 
 <h3>Other samplers</h3>
@@ -176,6 +177,7 @@ Summary
     <li>Emilian Bold (emi at apache.org)</li>
     <li><a href="http://ubikloadpack.com">Ubik Load Pack</a></li>
     <li>Justin McCartney (be_strew at yahoo.co.uk)</li>
+    <li>Vincent Herilier (https://github.com/vherilier)</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter. <br/>
 For this release we want to give special thanks to the following reporters for the clear
reports and tests made after our fixes:</p>



Mime
View raw message