Author: sebb
Date: Fri Oct 24 19:08:26 2008
New Revision: 707810
URL: http://svn.apache.org/viewvc?rev=707810&view=rev
Log:
Cookie Manager was not passing cookie policy to runtime threads so they always
used compatibility mode
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=707810&r1=707809&r2=707810&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Fri Oct 24 19:08:26 2008
@@ -59,11 +59,13 @@
private static final Logger log = LoggingManager.getLoggerForClass();
- public static final String CLEAR = "CookieManager.clearEachIteration";//
$NON-NLS-1$
+ //++ JMX tag values
+ private static final String CLEAR = "CookieManager.clearEachIteration";//
$NON-NLS-1$
- public static final String COOKIES = "CookieManager.cookies";// $NON-NLS-1$
+ private static final String COOKIES = "CookieManager.cookies";//
$NON-NLS-1$
- public static final String POLICY = "CookieManager.policy"; //$NON-NLS-1$
+ private static final String POLICY = "CookieManager.policy"; //$NON-NLS-1$
+ //-- JMX tag values
private static final String TAB = "\t"; //$NON-NLS-1$
@@ -82,29 +84,22 @@
public static final String DEFAULT_POLICY =
CookiePolicy.BROWSER_COMPATIBILITY;
public CookieManager() {
- setProperty(new CollectionProperty(COOKIES, new ArrayList()));
- setProperty(new BooleanProperty(CLEAR, false));
- setCookiePolicy(DEFAULT_POLICY);
}
// ensure that the initial cookies are copied to the per-thread instances
public Object clone(){
CookieManager clone = (CookieManager) super.clone();
clone.initialCookies = initialCookies;
+ clone.cookieSpec = cookieSpec;
return clone;
}
public String getPolicy() {
- return getPropertyAsString(POLICY,DEFAULT_POLICY);
+ return getPropertyAsString(POLICY, DEFAULT_POLICY);
}
public void setCookiePolicy(String policy){
- cookieSpec = CookiePolicy.getCookieSpec(policy);
- if (DEFAULT_POLICY.equals(policy)){// Don't clutter the JMX file
- removeProperty(POLICY);
- } else {
- setProperty(POLICY, policy);
- }
+ setProperty(POLICY, policy, DEFAULT_POLICY);
}
public CollectionProperty getCookies() {
@@ -442,6 +437,11 @@
public void testStarted() {
initialCookies = getCookies();
+ clearCookies();
+ cookieSpec = CookiePolicy.getCookieSpec(getPolicy());
+ if (log.isDebugEnabled()){
+ log.debug("Policy: "+getPolicy()+" Clear:
"+getClearEachIteration());
+ }
}
public void testEnded() {
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=707810&r1=707809&r2=707810&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Oct 24 19:08:26 2008
@@ -129,6 +129,7 @@
<li>Fix Summariser so it works in client server mode</li>
<li>Bug 45425 - JDBC Request does not support Unicode (changed sampler to use
UTF-8)</li>
<li>Bug 46016 - avoid possible NPE in JMSSampler</li>
+<li>Cookie Manager was not passing cookie policy to runtime threads so they
always used compatibility mode</li>
</ul>
<h3>Improvements</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
