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 2017/02/19 15:58:45 UTC
svn commit: r1783666 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http:
control/HeaderManager.java sampler/HTTPSamplerBase.java
Author: pmouawad
Date: Sun Feb 19 15:58:45 2017
New Revision: 1783666
URL: http://svn.apache.org/viewvc?rev=1783666&view=rev
Log:
Remove dead code. merge is always called with preferLocalValues=true
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=1783666&r1=1783665&r2=1783666&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java Sun Feb 19 15:58:45 2017
@@ -226,15 +226,12 @@ public class HeaderManager extends Confi
*
* @param element
* The object to be merged with
- * @param preferLocalValues
- * When both objects have a value for the same attribute, this
- * flag determines which value is preferred.
* @return merged HeaderManager
* @throws IllegalArgumentException
* if <code>element</code> is not an instance of
* {@link HeaderManager}
*/
- public HeaderManager merge(TestElement element, boolean preferLocalValues) {
+ public HeaderManager merge(TestElement element) {
if (!(element instanceof HeaderManager)) {
throw new IllegalArgumentException("Cannot merge type:" + this.getClass().getName() + " with type:" + element.getClass().getName());
}
@@ -253,16 +250,6 @@ public class HeaderManager extends Confi
if (mergedHeader.getName().equalsIgnoreCase(otherHeader.getName())) {
// we have a match
found = true;
- if (!preferLocalValues) {
- // prefer values from the other object
- if ( (otherHeader.getValue() == null) || (otherHeader.getValue().length() == 0) ) {
- // the other object has an empty value, so remove this value from the merged object
- merged.remove(j);
- } else {
- // use the other object's value
- mergedHeader.setValue(otherHeader.getValue());
- }
- }
// break out of the inner loop
break;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1783666&r1=1783665&r2=1783666&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Sun Feb 19 15:58:45 2017
@@ -838,7 +838,7 @@ public abstract class HTTPSamplerBase ex
HeaderManager mgr = getHeaderManager();
HeaderManager lValue = value;
if (mgr != null) {
- lValue = mgr.merge(value, true);
+ lValue = mgr.merge(value);
if (log.isDebugEnabled()) {
log.debug("Existing HeaderManager '" + mgr.getName() + "' merged with '" + lValue.getName() + "'");
for (int i = 0; i < lValue.getHeaders().size(); i++) {