jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1663098 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Date Sun, 01 Mar 2015 13:46:26 GMT
Author: pmouawad
Date: Sun Mar  1 13:46:25 2015
New Revision: 1663098

URL: http://svn.apache.org/r1663098
Log:
Remove useless check

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

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1663098&r1=1663097&r2=1663098&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Sun Mar
 1 13:46:25 2015
@@ -207,7 +207,8 @@ public class Proxy extends Thread {
                 try {
                     ba = request.parse(new BufferedInputStream(clientSocket.getInputStream()));
                 } catch (IOException ioe) { // most likely this is because of a certificate
error
-                    final String url = param.length>0 ?  " for '"+ param[0] +"'" : "";
+                    // param.length is 2 here
+                    final String url = " for '"+ param[0] +"'";
                     log.warn(port + "Problem with SSL certificate"+url+"? Ensure browser
is set to accept the JMeter proxy cert: " + ioe.getMessage());
                     // won't work: writeErrorToClient(HttpReplyHdr.formInternalError());
                     result = generateErrorResult(result, request, ioe, "\n**ensure browser
is set to accept the JMeter proxy certificate**"); // Generate result (if nec.) and populate
it



Mime
View raw message