Author: sebb
Date: Sat Feb 27 01:01:07 2016
New Revision: 1732590
URL: http://svn.apache.org/viewvc?rev=1732590&view=rev
Log:
Revert change that broke JMX compatibility
TODO fix GUI to support change in default
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=1732590&r1=1732589&r2=1732590&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Sat Feb 27 01:01:07 2016
@@ -101,8 +101,13 @@ public class CookieManager extends Confi
private transient CookieHandler cookieHandler;
private transient CollectionProperty initialCookies;
+
+ // MUST NOT BE CHANGED
+ @SuppressWarnings("deprecation") // cannot be changed
+ public static final String DEFAULT_POLICY =
CookieSpecs.BROWSER_COMPATIBILITY;
- public static final String DEFAULT_IMPLEMENTATION =
HC4CookieHandler.class.getName();
+ // MUST NOT BE CHANGED
+ public static final String DEFAULT_IMPLEMENTATION =
HC3CookieHandler.class.getName();
public CookieManager() {
clearCookies(); // Ensure that there is always a collection available
@@ -119,11 +124,11 @@ public class CookieManager extends Confi
}
public String getPolicy() {
- return getPropertyAsString(POLICY,
HC4CookieHandler.DEFAULT_POLICY_NAME);
+ return getPropertyAsString(POLICY, DEFAULT_POLICY);
}
public void setCookiePolicy(String policy){
- setProperty(POLICY, policy, HC4CookieHandler.DEFAULT_POLICY_NAME);
+ setProperty(POLICY, policy, DEFAULT_POLICY);
}
public CollectionProperty getCookies() {
