You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/25 23:10:00 UTC
svn commit: r1732387 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http:
control/CookieHandler.java control/CookieManager.java
control/HC3CookieHandler.java control/HC4CookieHandler.java
gui/CookiePanel.java
Author: pmouawad
Date: Thu Feb 25 22:10:00 2016
New Revision: 1732387
URL: http://svn.apache.org/viewvc?rev=1732387&view=rev
Log:
Bug 58756 - CookieManager : Cookie Policy select box content must depend on Cookie implementation
After fix to Bug 58756, default was used as the default policy.
But this is wrong as:
- HttpHC3Impl used "compabitility" as default
- HttpHC4Impl should use "standard" as default (This explains the reported
issue by Maxime Chassagneux on Mailing list related to dates parsing)
Bugzilla Id: 58756
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java?rev=1732387&r1=1732386&r2=1732387&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java Thu Feb 25 22:10:00 2016
@@ -49,4 +49,9 @@ public interface CookieHandler {
String getCookieHeaderForURL(CollectionProperty cookiesCP, URL url,
boolean allowVariableCookie);
+ /**
+ * @return Cookie default policy name
+ */
+ String getDefaultPolicy();
+
}
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=1732387&r1=1732386&r2=1732387&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 Thu Feb 25 22:10:00 2016
@@ -101,8 +101,6 @@ public class CookieManager extends Confi
private transient CookieHandler cookieHandler;
private transient CollectionProperty initialCookies;
-
- public static final String DEFAULT_POLICY = CookieSpecs.DEFAULT;
public static final String DEFAULT_IMPLEMENTATION = HC4CookieHandler.class.getName();
@@ -121,11 +119,11 @@ public class CookieManager extends Confi
}
public String getPolicy() {
- return getPropertyAsString(POLICY, DEFAULT_POLICY);
+ return getPropertyAsString(POLICY);
}
public void setCookiePolicy(String policy){
- setProperty(POLICY, policy, DEFAULT_POLICY);
+ setProperty(POLICY, policy);
}
public CollectionProperty getCookies() {
@@ -145,11 +143,11 @@ public class CookieManager extends Confi
}
public String getImplementation() {
- return getPropertyAsString(IMPLEMENTATION, DEFAULT_IMPLEMENTATION);
+ return getPropertyAsString(IMPLEMENTATION);
}
public void setImplementation(String implementation){
- setProperty(IMPLEMENTATION, implementation, DEFAULT_IMPLEMENTATION);
+ setProperty(IMPLEMENTATION, implementation);
}
/**
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java?rev=1732387&r1=1732386&r2=1732387&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java Thu Feb 25 22:10:00 2016
@@ -36,9 +36,10 @@ import org.apache.log.Logger;
public class HC3CookieHandler implements CookieHandler {
private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final String DEFAULT_POLICY_NAME = "compatibility";
public static final String[] AVAILABLE_POLICIES = new String[] {
+ DEFAULT_POLICY_NAME,
"default",
- "compatibility",
"rfc2109",
"rfc2965",
"ignorecookies",
@@ -204,4 +205,9 @@ public class HC3CookieHandler implements
}
}
+
+ @Override
+ public String getDefaultPolicy() {
+ return DEFAULT_POLICY_NAME;
+ }
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java?rev=1732387&r1=1732386&r2=1732387&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java Thu Feb 25 22:10:00 2016
@@ -53,17 +53,19 @@ import org.apache.log.Logger;
public class HC4CookieHandler implements CookieHandler {
private static final Logger log = LoggingManager.getLoggerForClass();
-
+
+ static String DEFAULT_POLICY_NAME = CookieSpecs.STANDARD;
+
public static final String[] AVAILABLE_POLICIES = new String[]{
- CookieSpecs.DEFAULT,
- CookieSpecs.STANDARD,
+ DEFAULT_POLICY_NAME,
CookieSpecs.STANDARD_STRICT,
CookieSpecs.IGNORE_COOKIES,
- CookieSpecs.BEST_MATCH,
- CookieSpecs.BROWSER_COMPATIBILITY,
+ CookieSpecs.NETSCAPE,
+ CookieSpecs.DEFAULT,
"rfc2109",
"rfc2965",
- CookieSpecs.NETSCAPE
+ CookieSpecs.BEST_MATCH,
+ CookieSpecs.BROWSER_COMPATIBILITY
};
private final transient CookieSpec cookieSpec;
@@ -242,4 +244,9 @@ public class HC4CookieHandler implements
}
return ret;
}
+
+ @Override
+ public String getDefaultPolicy() {
+ return DEFAULT_POLICY_NAME;
+ }
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java?rev=1732387&r1=1732386&r2=1732387&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CookiePanel.java Thu Feb 25 22:10:00 2016
@@ -278,7 +278,6 @@ public class CookiePanel extends Abstrac
tableModel.clearData();
clearEachIteration.setSelected(false);
- policy.setText(CookieManager.DEFAULT_POLICY);
selectHandlerPanel.setSelectedItem(CookieManager.DEFAULT_IMPLEMENTATION
.substring(CookieManager.DEFAULT_IMPLEMENTATION.lastIndexOf('.') + 1));
deleteButton.setEnabled(false);
@@ -332,7 +331,6 @@ public class CookiePanel extends Abstrac
policy = new JLabeledChoice(
JMeterUtils.getResString("cookie_manager_policy"), //$NON-NLS-1$
getPolicies(CookieManager.DEFAULT_IMPLEMENTATION));
- policy.setText(CookieManager.DEFAULT_POLICY);
setLayout(new BorderLayout());
setBorder(makeBorder());
JPanel northPanel = new JPanel();