You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/05/30 03:23:32 UTC
svn commit: r661545 - in /jakarta/jmeter/trunk/src:
core/org/apache/jmeter/testelement/AbstractTestElement.java
protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Author: sebb
Date: Thu May 29 18:23:32 2008
New Revision: 661545
URL: http://svn.apache.org/viewvc?rev=661545&view=rev
Log:
Temporarily remove the new setProperty() method to reduce Javadoc changes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=661545&r1=661544&r2=661545&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Thu May 29 18:23:32 2008
@@ -265,24 +265,27 @@
setProperty(new StringProperty(name, value));
}
- /**
- * Create a String property - but only if it is not the default.
- * This is intended for use when adding new properties to JMeter
- * so that JMX files are not expanded unnecessarily.
- *
- * N.B. - must agree with the default applied when reading the property.
- *
- * @param name property name
- * @param value current value
- * @param dflt default
- */
- public void setProperty(String name, String value, String dflt) {
- if (dflt.equals(value)) {
- removeProperty(name);
- } else {
- setProperty(new StringProperty(name, value));
- }
- }
+// TODO - enable this for the next version
+// Doing so now will generate huge Javadoc changes...
+
+// /**
+// * Create a String property - but only if it is not the default.
+// * This is intended for use when adding new properties to JMeter
+// * so that JMX files are not expanded unnecessarily.
+// *
+// * N.B. - must agree with the default applied when reading the property.
+// *
+// * @param name property name
+// * @param value current value
+// * @param dflt default
+// */
+// public void setProperty(String name, String value, String dflt) {
+// if (dflt.equals(value)) {
+// removeProperty(name);
+// } else {
+// setProperty(new StringProperty(name, value));
+// }
+// }
public void setProperty(String name, boolean value) {
setProperty(new StringProperty(name, Boolean.toString(value)));
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=661545&r1=661544&r2=661545&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 Thu May 29 18:23:32 2008
@@ -98,7 +98,11 @@
public void setCookiePolicy(String policy){
cookieSpec = CookiePolicy.getCookieSpec(policy);
- setProperty(POLICY, policy, DEFAULT_POLICY);// Don't clutter the JMX file
+ if (DEFAULT_POLICY.equals(policy)){// Don't clutter the JMX file
+ removeProperty(POLICY);
+ } else {
+ setProperty(POLICY, policy);
+ }
}
public CollectionProperty getCookies() {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org