jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1663105 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Date Sun, 01 Mar 2015 13:57:44 GMT
Author: pmouawad
Date: Sun Mar  1 13:57:44 2015
New Revision: 1663105

URL: http://svn.apache.org/r1663105
Log:
Check delete result

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=1663105&r1=1663104&r2=1663105&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 Mar  1 13:57:44 2015
@@ -1488,7 +1488,9 @@ public class ProxyControl extends Generi
             keyPassword = storePassword; // we use same password for both
             setPassword(storePassword);
             log.info("Generating standard keypair in " + CERT_PATH_ABS);
-            CERT_PATH.delete(); // safer to start afresh
+            if(!CERT_PATH.delete()){ // safer to start afresh
+                log.warn("Could not delete "+CERT_PATH.getAbsolutePath()+", this could create
issues, stop jmeter, ensure file is deleted and restart again");
+            }
             KeyToolUtils.genkeypair(CERT_PATH, JMETER_SERVER_ALIAS, storePassword, CERT_VALIDITY,
null, null);
             keyStore = getKeyStore(storePassword.toCharArray()); // This should now work
         }



Mime
View raw message