Author: sebb
Date: Tue Mar 20 11:29:11 2007
New Revision: 520511

URL: http://svn.apache.org/viewvc?view=rev&rev=520511
Log:
Bug 41902 - NPE in HTTPSampler when responseCode = -1

Modified:
    
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/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=520511&r1=520510&r2=520511
==============================================================================
--- 
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
 Tue Mar 20 11:29:11 2007
@@ -460,12 +460,19 @@
                        int errorLevel = conn.getResponseCode();
             String respMsg = conn.getResponseMessage();
             if (errorLevel == -1){// Bug 38902 - sometimes -1 seems to be 
returned unnecessarily
-                try {
-                    errorLevel = Integer.parseInt(respMsg.substring(0, 3));
-                    log.warn("ResponseCode==-1; parsed "+respMsg+ " as 
"+errorLevel);
-                  } catch (NumberFormatException e) {
-                    log.warn("ResponseCode==-1; could not parse "+respMsg);
-                  }                
+               if (respMsg != null) {// Bug 41902 - NPE
+                       try {
+                           errorLevel = Integer.parseInt(respMsg.substring(0, 
3));
+                           log.warn("ResponseCode==-1; parsed "+respMsg+ " as 
"+errorLevel);
+                         } catch (NumberFormatException e) {
+                           log.warn("ResponseCode==-1; could not parse 
"+respMsg);
+                         }
+               } else {
+                       respMsg="(null)";
+                       String hdr=conn.getHeaderField(0);
+                       if (hdr == null) hdr="(null)";
+                    log.warn("ResponseCode==-1 & null ResponseMessage. 
Header(0)= "+hdr);
+               }
             }
                        res.setResponseCode(Integer.toString(errorLevel));
                        res.setSuccessful(isSuccessCode(errorLevel));

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?view=diff&rev=520511&r1=520510&r2=520511
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Tue Mar 20 11:29:11 2007
@@ -188,7 +188,8 @@
 <li>Bug 40325 - allow specification of proxyuser and proxypassword for 
WebServiceSampler</li>
 <li>Change HttpClient proxy definition to use NTCredentials; added 
http.proxyDomain property for this</li>
 <li>Bug 40371 - response assertion "pattern to test" scrollbar problem</li>
-<li>Bug 40589- Unescape XML entities in embedded URLs</li>
+<li>Bug 40589 - Unescape XML entities in embedded URLs</li>
+<li>Bug 41902 - NPE in HTTPSampler when responseCode = -1</li>
 </ul>
 
 <h3>Version 2.2</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to