svn commit: r1557552 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Sun Jan 12 16:19:58 2014
New Revision: 1557552

URL: http://svn.apache.org/r1557552
Log:
Bug 52013 - Test Script Recorder's Child View Results Tree does not take into account Test Script Recorder excluded/included URLs
Set "Notify Child Listeners of filtered samplers" default value to true as per sebb last comment
Bugzilla Id: 52013

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1557552&r1=1557551&r2=1557552&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Sun Jan 12 16:19:58 2014
@@ -258,7 +258,7 @@ public class ProxyControl extends Generi
 
     private volatile boolean samplerDownloadImages = false;
 
-    private volatile boolean notifyChildSamplerListenersOfFilteredSamples = false;
+    private volatile boolean notifyChildSamplerListenersOfFilteredSamples = true;
 
     private volatile boolean regexMatch = false;// Should we match using regexes?
 
@@ -424,7 +424,7 @@ public class ProxyControl extends Generi
     }
 
     public boolean getNotifyChildSamplerListenerOfFilteredSamplers() {
-        return getPropertyAsBoolean(NOTIFY_CHILD_SAMPLER_LISTENERS_FILTERED, false);
+        return getPropertyAsBoolean(NOTIFY_CHILD_SAMPLER_LISTENERS_FILTERED, true);
     }
     
     public boolean getRegexMatch() {

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1557552&r1=1557551&r2=1557552&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Sun Jan 12 16:19:58 2014
@@ -843,7 +843,7 @@ public class ProxyControlGui extends Log
                 .getResString("notify_child_listeners_fr"))); // $NON-NLS-1$
         
         notifyChildSamplerListenerOfFilteredSamplersCB = new JCheckBox(JMeterUtils.getResString("notify_child_listeners_fr")); // $NON-NLS-1$
-        notifyChildSamplerListenerOfFilteredSamplersCB.setSelected(false);
+        notifyChildSamplerListenerOfFilteredSamplersCB.setSelected(true);
         notifyChildSamplerListenerOfFilteredSamplersCB.addActionListener(this);
         notifyChildSamplerListenerOfFilteredSamplersCB.setActionCommand(ENABLE_RESTART);
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1557552&r1=1557551&r2=1557552&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Jan 12 16:19:58 2014
@@ -114,8 +114,6 @@ A workaround is to use a Java 7 update 4
 <ch_section>Incompatible changes</ch_section>
 
 <ul>
-<li>Since JMeter 2.12, HTTP(S) Test Script Recorder does not deliver anymore filtered samplers (as per Include/Exclude settings) to child listeners.
-If you want child Listeners to be notified, check ""otify Child Listeners of filtered samplers" option.</li>
 </ul>
 
 <!-- =================== Bug fixes =================== -->