Author: sebb
Date: Thu Sep 6 06:11:01 2007
New Revision: 573250
URL: http://svn.apache.org/viewvc?rev=573250&view=rev
Log:
If Java HTTP sampler sees null ResponseMessage, replace with HTTP header
Modified:
jakarta/jmeter/branches/rel-2-2/docs/changes.html
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/docs/changes.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/changes.html?rev=573250&r1=573249&r2=573250&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/changes.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/changes.html Thu Sep 6 06:11:01 2007
@@ -147,6 +147,11 @@
</li>
+
<li >
+ If Java HTTP
sampler sees null ResponseMessage, replace with HTTP header
+ </li>
+
+
</ul>
<h4 >
Improvements
@@ -545,7 +550,6 @@
</p>
<p >
-
Control-Z no longer used for Remote Start All - this now uses Control+Shift+R
</p>
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?rev=573250&r1=573249&r2=573250&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Thu Sep 6 06:11:01 2007
@@ -493,9 +493,9 @@
int errorLevel = conn.getResponseCode();
String respMsg = conn.getResponseMessage();
+ String hdr=conn.getHeaderField(0);
+ if (hdr == null) hdr="(null)"; // $NON-NLS-1$
if (errorLevel == -1){// Bug 38902 - sometimes -1 seems to be
returned unnecessarily
- String hdr=conn.getHeaderField(0);
- if (hdr == null) hdr="(null)"; // $NON-NLS-1$
if (respMsg != null) {// Bug 41902 - NPE
try {
errorLevel = Integer.parseInt(respMsg.substring(0,
3));
@@ -515,6 +515,9 @@
}
res.setSuccessful(isSuccessCode(errorLevel));
+ if (respMsg == null) {// has been seen in a redirect
+ respMsg=hdr; // use header (if possible) if no
message found
+ }
res.setResponseMessage(respMsg);
String ct = conn.getContentType();
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=573250&r1=573249&r2=573250&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Thu Sep 6 06:11:01 2007
@@ -34,6 +34,7 @@
<h4>Bug fixes</h4>
<ul>
<li>Fix NPE in SampleResultConverter - XStream PrettyPrintWriter cannot handle
nulls</li>
+<li>If Java HTTP sampler sees null ResponseMessage, replace with HTTP
header</li>
</ul>
<h4>Improvements</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
