Author: sebb
Date: Sat Mar 19 14:26:12 2016
New Revision: 1735776
URL: http://svn.apache.org/viewvc?rev=1735776&view=rev
Log:
New fields/changed defaults cause earlier test plans to be marked as changed
Fix PublisherSampler: convert default to empty string on output (as that is
what the input methods do)
Bugzilla Id: 59173
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java?rev=1735776&r1=1735775&r2=1735776&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
(original)
+++
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
Sat Mar 19 14:26:12 2016
@@ -534,11 +534,19 @@ public class PublisherSampler extends Ba
}
public void setPriority(String s) {
- setProperty(JMS_PRIORITY, s, Utils.DEFAULT_PRIORITY_4);
+ // Bug 59173
+ if (Utils.DEFAULT_PRIORITY_4.equals(s)) {
+ s = ""; // $NON-NLS-1$ make sure the default is not saved
explicitly
+ }
+ setProperty(JMS_PRIORITY, s); // always need to save the field
}
public void setExpiration(String s) {
- setProperty(JMS_EXPIRATION, s, Utils.DEFAULT_NO_EXPIRY);
+ // Bug 59173
+ if (Utils.DEFAULT_NO_EXPIRY.equals(s)) {
+ s = ""; // $NON-NLS-1$ make sure the default is not saved
explicitly
+ }
+ setProperty(JMS_EXPIRATION, s); // always need to save the field
}
/**
