From commits-return-3292-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Sep 13 13:51:19 2014 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0EEBC11BB0 for ; Sat, 13 Sep 2014 13:51:19 +0000 (UTC) Received: (qmail 7304 invoked by uid 500); 13 Sep 2014 13:51:19 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 7270 invoked by uid 500); 13 Sep 2014 13:51:19 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 7261 invoked by uid 99); 13 Sep 2014 13:51:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Sep 2014 13:51:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,TVD_GET_STOCK X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Sep 2014 13:51:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E54422388993; Sat, 13 Sep 2014 13:50:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1624740 - /jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Date: Sat, 13 Sep 2014 13:50:57 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140913135057.E54422388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pmouawad Date: Sat Sep 13 13:50:57 2014 New Revision: 1624740 URL: http://svn.apache.org/r1624740 Log: Bug 56057 - JMeter does not create ApacheJMeterTemporaryRootCA.crt when starting a recording Add a checks for generation of CRT before copying it Bugzilla Id: 56057 Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java?rev=1624740&r1=1624739&r2=1624740&view=diff ============================================================================== --- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java (original) +++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Sat Sep 13 13:50:57 2014 @@ -251,7 +251,11 @@ public class KeyToolUtils { // Export the Root CA for Firefox/Chrome/IE KeyToolUtils.keytool("-exportcert", keystore, password, ROOTCA_ALIAS, null, null, "-rfc", "-file", ROOT_CACERT_CRT); // Copy for Opera - FileUtils.copyFile(caCert_crt, caCert_usr); + if(caCert_crt.exists() && caCert_crt.canRead()) { + FileUtils.copyFile(caCert_crt, caCert_usr); + } else { + log.warn("Failed creating "+caCert_crt.getAbsolutePath()+", check 'keytool' utility in path is available and points to a JDK >= 7"); + } } /**