jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1556930 - /jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
Date Thu, 09 Jan 2014 19:34:06 GMT
Author: sebb
Date: Thu Jan  9 19:34:06 2014
New Revision: 1556930

URL: http://svn.apache.org/r1556930
Log:
hard-to-decipher error message when Proxy recording fails due to JMeter being located in Program
Files
Bugzilla Id: 55959

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=1556930&r1=1556929&r2=1556930&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Thu Jan  9 19:34:06
2014
@@ -165,7 +165,9 @@ public class KeyToolUtils {
         try {
             int exitVal = nativeCommand.run(arguments);
             if (exitVal != 0) {
-                throw new IOException("Command :'"+formatCommand(arguments)+"' failed, code:
" + exitVal + "\n" + nativeCommand.getOutResult());
+                throw new IOException("  >> " + nativeCommand.getOutResult().trim()
+ " <<"
+                    + "\nCommand failed, code: " + exitVal
+                    + "\n'" + formatCommand(arguments)+"'");
             }
         } catch (InterruptedException e) {
             throw new IOException("Command was interrupted\n" + nativeCommand.getOutResult(),
e);
@@ -183,7 +185,7 @@ public class KeyToolUtils {
         for (String string : arguments) {
             final boolean quote = string.contains(" ");
             if (quote) builder.append("\"");
-            builder.append(redact? "{redacted)" : string);
+            builder.append(redact? "{redacted}" : string);
             if (quote) builder.append("\"");
             builder.append(" ");
             redact = string.equals("-storepass") || string.equals("-keypass");



Mime
View raw message