jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1204496 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java xdocs/changes.xml
Date Mon, 21 Nov 2011 13:53:29 GMT
Author: sebb
Date: Mon Nov 21 13:53:29 2011
New Revision: 1204496

URL: http://svn.apache.org/viewvc?rev=1204496&view=rev
Log:
Bug 52221 - Nullpointer Exception with use Retrieve Embedded Resource without HTTP Cache Manager

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

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1204496&r1=1204495&r2=1204496&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Mon Nov 21 13:53:29 2011
@@ -1736,7 +1736,10 @@ public abstract class HTTPSamplerBase ex
             this.depth = depth;
             this.sampler = (HTTPSamplerBase) base.clone();
             // We don't want to use CacheManager clone but the parent one, and CacheManager
is Thread Safe
-            this.sampler.setCacheManager(base.getCacheManager());
+            CacheManager cacheManager = base.getCacheManager();
+            if (cacheManager != null) {
+                this.sampler.setCacheManager(cacheManager);
+            }
             
             if(cookieManager != null) {
                 CookieManager clonedCookieManager = (CookieManager) cookieManager.clone();

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1204496&r1=1204495&r2=1204496&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Mon Nov 21 13:53:29 2011
@@ -102,6 +102,7 @@ This behaviour can be changed with prope
 <li>Bug 52126 - HttpClient4 does not clear cookies between iterations</li>
 <li>Bug 52129 - Reported Body Size is wrong when using HTTP Client 4 and Keep Alive
connection</li>
 <li>Bug 52137 - Problems with HTTP Cache Manager</li>
+<li>Bug 52221 - Nullpointer Exception with use Retrieve Embedded Resource without HTTP
Cache Manager</li>
 </ul>
 
 <h3>Other Samplers</h3>



Mime
View raw message