jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1197642 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java xdocs/changes.xml
Date Fri, 04 Nov 2011 16:39:07 GMT
Author: pmouawad
Date: Fri Nov  4 16:39:07 2011
New Revision: 1197642

URL: http://svn.apache.org/viewvc?rev=1197642&view=rev
Log:
Bug 52137 - Problems with HTTP Cache Manager 

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
    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/config/gui/HttpDefaultsGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java?rev=1197642&r1=1197641&r2=1197642&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/HttpDefaultsGui.java
Fri Nov  4 16:39:07 2011
@@ -28,6 +28,7 @@ import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.config.gui.AbstractConfigGui;
 import org.apache.jmeter.gui.util.HorizontalPanel;
@@ -93,8 +94,13 @@ public class HttpDefaultsGui extends Abs
             // This also allows HTTPDefaults to work for this checkbox
             config.removeProperty(HTTPSamplerBase.CONCURRENT_DWN);
         }
-        config.setProperty(new StringProperty(HTTPSamplerBase.CONCURRENT_POOL, 
-                String.valueOf(HTTPSamplerBase.CONCURRENT_POOL_SIZE)));
+        if(!StringUtils.isEmpty(concurrentPool.getText())) {
+        	config.setProperty(new StringProperty(HTTPSamplerBase.CONCURRENT_POOL,
+        			concurrentPool.getText()));
+        } else {
+        	config.setProperty(new StringProperty(HTTPSamplerBase.CONCURRENT_POOL,
+        			String.valueOf(HTTPSamplerBase.CONCURRENT_POOL_SIZE)));
+        }
     }
 
     /**

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=1197642&r1=1197641&r2=1197642&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
Fri Nov  4 16:39:07 2011
@@ -1735,6 +1735,8 @@ public abstract class HTTPSamplerBase ex
             this.areFollowingRedirect = areFollowingRedirect;
             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());
             
             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=1197642&r1=1197641&r2=1197642&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Nov  4 16:39:07 2011
@@ -99,6 +99,7 @@ these occurs, Sampler is marked as faile
 <li>Bug 51919 - Random ConcurrentModificationException or NoSuchElementException in
CookieManager#removeMatchingCookies when using Concurrent Download</li>
 <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>
 </ul>
 
 <h3>Other Samplers</h3>



Mime
View raw message