Author: pmouawad
Date: Tue Mar 15 21:37:38 2016
New Revision: 1735170
URL: http://svn.apache.org/viewvc?rev=1735170&view=rev
Log:
Bug 59173 - New fields/changed defaults cause earlier test plans to be marked
as changed
Fix RegExtractor saving with 3.0
Bugzilla Id: 59173
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=1735170&r1=1735169&r2=1735170&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Tue Mar 15 21:37:38 2016
@@ -46,7 +46,7 @@ import org.apache.oro.text.regex.Perl5Ma
public class RegexExtractor extends AbstractScopedTestElement implements
PostProcessor, Serializable {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -87,6 +87,8 @@ public class RegexExtractor extends Abst
private static final String UNDERSCORE = "_"; // $NON-NLS-1$
+ private static final boolean DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE = false;
+
private transient List<Object> template;
/**
@@ -449,7 +451,7 @@ public class RegexExtractor extends Abst
* @param defaultEmptyValue The default value for the variable
*/
public void setDefaultEmptyValue(boolean defaultEmptyValue) {
- setProperty(DEFAULT_EMPTY_VALUE, defaultEmptyValue);
+ setProperty(DEFAULT_EMPTY_VALUE, defaultEmptyValue,
DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE);
}
/**
@@ -466,7 +468,7 @@ public class RegexExtractor extends Abst
* Do we set default value to "" value when if it's empty
*/
public boolean isEmptyDefaultValue() {
- return getPropertyAsBoolean(DEFAULT_EMPTY_VALUE);
+ return getPropertyAsBoolean(DEFAULT_EMPTY_VALUE,
DEFAULT_VALUE_FOR_DEFAULT_EMPTY_VALUE);
}
public void setTemplate(String template) {
