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/07/22 13:52:34 UTC

svn commit: r1802695 - in /jmeter/trunk: src/components/org/apache/jmeter/visualizers/backend/BackendListener.java xdocs/changes.xml

Author: pmouawad
Date: Sat Jul 22 13:52:34 2017
New Revision: 1802695

URL: http://svn.apache.org/viewvc?rev=1802695&view=rev
Log:
Bug 61198 - Backend Listener does not work properly in main script when included scripts also contain Backend Listener
Bugzilla Id: 61198

Modified:
    jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java?rev=1802695&r1=1802694&r2=1802695&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java Sat Jul 22 13:52:34 2017
@@ -120,10 +120,6 @@ public class BackendListener extends Abs
      * Create a BackendListener.
      */
     public BackendListener() {
-        synchronized (LOCK) {
-            queuesByTestElementName.clear();
-        }
-
         setArguments(new Arguments());
     }
 
@@ -371,10 +367,16 @@ public class BackendListener extends Abs
             if (log.isDebugEnabled()) {
                 log.debug("testEnded called on instance {}#{}", myName, listenerClientDataForName.instanceCount);
             }
-            listenerClientDataForName.instanceCount--;
-            if (listenerClientDataForName.instanceCount > 0){
-                // Not the last instance of myName
-                return;
+            if(listenerClientDataForName != null) {
+                listenerClientDataForName.instanceCount--;
+                if (listenerClientDataForName.instanceCount > 0){
+                    // Not the last instance of myName
+                    return;
+                } else {
+                    queuesByTestElementName.remove(myName);
+                }
+            } else {
+                log.error("No listener client data found for BackendListener {}", myName);
             }
         }
         try {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1802695&r1=1802694&r2=1802695&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 22 13:52:34 2017
@@ -174,6 +174,7 @@ Summary
     <li><bug>61005</bug>View Results Tree - Browser Response Data is not clearing</li>
     <li><bug>61121</bug>InfluxdbBackendListenerClient: Only all percentiles are sent, not KO and OK</li>
     <li><bug>60961</bug>Try to keep status of selected and expanded elements in View Results Tree when new elements are added.</li>
+    <li><bug>61198</bug>Backend Listener does not work properly in main script when included scripts also contain Backend Listener</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>