jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1621524 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Date Sat, 30 Aug 2014 19:15:54 GMT
Author: pmouawad
Date: Sat Aug 30 19:15:53 2014
New Revision: 1621524

URL: http://svn.apache.org/r1621524
Log:
Bug 54778 - HTTP Sampler should not return 204 when resource is found in Cache
Bugzilla Id: 54778

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1621524&r1=1621523&r2=1621524&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sat Aug 30 19:15:53
2014
@@ -564,6 +564,10 @@ public class SampleResult implements Ser
      * @param subResult
      */
     public void addSubResult(SampleResult subResult) {
+        if(subResult == null) {
+            // see https://issues.apache.org/bugzilla/show_bug.cgi?id=54778
+            return;
+        }
         String tn = getThreadName();
         if (tn.length()==0) {
             tn=Thread.currentThread().getName();//TODO do this more efficiently



Mime
View raw message