Author: pmouawad
Date: Tue Nov 15 13:20:20 2011
New Revision: 1202175

URL: http://svn.apache.org/viewvc?rev=1202175&view=rev
Log:
Bug 50799 - Having a non-HTTP sampler in a http test plan prevents multiple header managers from working

Fix ROLLBACK

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=1202175&r1=1202174&r2=1202175&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Tue Nov 15 13:20:20 2011
@@ -399,7 +399,7 @@ public abstract class AbstractTestElemen
         PropertyIterator iter = element.propertyIterator();
         while (iter.hasNext()) {
             JMeterProperty prop = iter.next();
-            addProperty(prop, true);
+            addProperty(prop, false);
         }
     }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1202175&r1=1202174&r2=1202175&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Nov 15 13:20:20 2011
@@ -147,7 +147,6 @@ This behaviour can be changed with prope
 <li>Bug 51733 - SyncTimer is messed up if you a interrupt a test plan</li>
 <li>Bug 52118 - New toolbar : shutdown and stop buttons not disabled when no test is running</li>
 <li>Bug 52125 - StatCalculator.addAll(StatCalculator calc) joins incorrect if there are more samples with the same response time in one of the TreeMap</li>
-<li>Bug 50799 - Having a non-HTTP sampler in a http test plan prevents multiple header managers from working</li>
 </ul>
 
 <!-- =================== Improvements =================== -->