You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/11/17 14:44:00 UTC

svn commit: r1542724 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

Author: sebb
Date: Sun Nov 17 13:44:00 2013
New Revision: 1542724

URL: http://svn.apache.org/r1542724
Log:
Must recreate keystore here too

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1542724&r1=1542723&r2=1542724&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Sun Nov 17 13:44:00 2013
@@ -1264,7 +1264,8 @@ public class ProxyControl extends Generi
                     log.warn("Could not open/read key store " + e.getMessage()); // message includes the file name
                 }
             } catch (GeneralSecurityException e) {
-                log.warn("Problem reading key store" + e.getMessage());
+            	keyStore = null; // if cert is not valid, flag up to recreate it
+                log.warn("Problem reading key store: " + e.getMessage());
             }
         }
         if (keyStore == null) { // no existing file or not valid