You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/03/24 00:40:23 UTC
svn commit: r521946 -
/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Author: sebb
Date: Fri Mar 23 16:40:22 2007
New Revision: 521946
URL: http://svn.apache.org/viewvc?view=rev&rev=521946
Log:
Set responseCode to null if -1
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
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?view=diff&rev=521946&r1=521945&r2=521946
==============================================================================
--- 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 Fri Mar 23 16:40:22 2007
@@ -60,7 +60,8 @@
private static final Logger log = LoggingManager.getLoggerForClass();
private static final int MAX_CONN_RETRIES =
- JMeterUtils.getPropDefault("http.java.sampler.retries",10); // Maximum connection retries
+ JMeterUtils.getPropDefault("http.java.sampler.retries" // $NON-NLS-1$
+ ,10); // Maximum connection retries
static {
log.info("Maximum connection retries = "+MAX_CONN_RETRIES); // $NON-NLS-1$
@@ -219,7 +220,9 @@
byte[] readBuffer = getThreadContext().getReadBuffer();
BufferedInputStream in;
- if ((conn.getContentLength() == 0) && JMeterUtils.getPropDefault("httpsampler.obey_contentlength", false)) {
+ if ((conn.getContentLength() == 0)
+ && JMeterUtils.getPropDefault("httpsampler.obey_contentlength", // $NON-NLS-1$
+ false)) {
log.info("Content-Length: 0, not reading http-body");
res.setResponseHeaders(getResponseHeaders(conn));
return NULL_BA;
@@ -488,7 +491,7 @@
String respMsg = conn.getResponseMessage();
if (errorLevel == -1){// Bug 38902 - sometimes -1 seems to be returned unnecessarily
String hdr=conn.getHeaderField(0);
- if (hdr == null) hdr="(null)";
+ if (hdr == null) hdr="(null)"; // $NON-NLS-1$
if (respMsg != null) {// Bug 41902 - NPE
try {
errorLevel = Integer.parseInt(respMsg.substring(0, 3));
@@ -501,7 +504,11 @@
log.warn("ResponseCode==-1 & null ResponseMessage. Header(0)= "+hdr);
}
}
- res.setResponseCode(Integer.toString(errorLevel));
+ if (errorLevel == -1) {
+ res.setResponseCode("(null)"); // $NON-NLS-1$
+ } else {
+ res.setResponseCode(Integer.toString(errorLevel));
+ }
res.setSuccessful(isSuccessCode(errorLevel));
res.setResponseMessage(respMsg);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org