svn commit: r1518794 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java

[sebb]

Author: sebb
Date: Thu Aug 29 20:06:04 2013
New Revision: 1518794

URL: http://svn.apache.org/r1518794
Log:
Guard against impossible(?) occurrence

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=1518794&r1=1518793&r2=1518794&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 
Thu Aug 29 20:06:04 2013
@@ -201,7 +201,9 @@ public class Proxy extends Thread {
                     log.debug(port + "Start to negotiate SSL connection, host: 
" + param[0]);
                     clientSocket = startSSL(clientSocket, param[0]);
                 } else {
-                    log.warn("In SSL request, unable to find host and port in 
CONNECT request");
+                    // Should not happen, but if it does we don't want to 
continue 
+                    log.error("In SSL request, unable to find host and port in 
CONNECT request: " + request.getUrl());
+                    throw new JMeterException(); // hack to skip processing
                 }
                 // Re-parse (now it's the http request over SSL)
                 ba = request.parse(new 
BufferedInputStream(clientSocket.getInputStream()));