jakarta-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1127881 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java xdocs/changes.xml
Date Thu, 26 May 2011 12:14:54 GMT
Author: sebb
Date: Thu May 26 12:14:54 2011
New Revision: 1127881

URL: http://svn.apache.org/viewvc?rev=1127881&view=rev
Log:
Bug 51268 - HTTPS request through an invalid proxy causes NullPointerException and does not
show in result tree.
Rather than delegating to the JMeter thread handler for "unexpected" failures, ensure all
Exceptions generate a sample error.

Modified:
    jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1127881&r1=1127880&r2=1127881&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Thu May 26 12:14:54 2011
@@ -24,7 +24,6 @@ import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -1001,11 +1000,7 @@ public abstract class HTTPSamplerBase ex
             }
             res.setSampleLabel(getName());
             return res;
-        } catch (MalformedURLException e) {
-            return errorResult(e, new HTTPSampleResult());
-        } catch (IOException e) {
-            return errorResult(e, new HTTPSampleResult());
-        } catch (URISyntaxException e) {
+        } catch (Exception e) {
             return errorResult(e, new HTTPSampleResult());
         }
     }

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1127881&r1=1127880&r2=1127881&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu May 26 12:14:54 2011
@@ -101,6 +101,9 @@ This is internal to the workings of the 
 <li>Bug 50963 - AjpSampler throws java.lang.StringIndexOutOfBoundsException</li>
 <li>Bug 50516 - "Host" header in HTTP Header Manager is not included in generated HTTP
request</li>
 <li>Bug 50544 - In Apache Common Log the HEAD requests cause problems.</li>
+<li>Bug 51268 - HTTPS request through an invalid proxy causes NullPointerException
and does not show in result tree.
+Rather than delegating to the JMeter thread handler for "unexpected" failures, ensure all
Exceptions generate a sample error.
+</li>
 </ul>
 
 <h3>Other Samplers</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org


Mime
View raw message