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

[pmouawad]

Author: pmouawad
Date: Fri Dec  8 21:32:24 2017
New Revision: 1817575

URL: http://svn.apache.org/viewvc?rev=1817575&view=rev
Log:
Bug 61878 - BackendListener : NPE if BackendListenerClient#getDefaultParameters 
returns null 
Bugzilla Id: 61878

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

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java?rev=1817575&r1=1817574&r2=1817575&view=diff
==============================================================================
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
 Fri Dec  8 21:32:24 2017
@@ -182,7 +182,9 @@ public class BackendListenerGui extends
                 try {
                     defaultArgs = client.getDefaultParameters();
                     Arguments currentUserArgs = 
oldClient.getDefaultParameters();
-                    
userArgMap.keySet().removeAll(currentUserArgs.getArgumentsAsMap().keySet());
+                    if(currentUserArgs != null) {
+                        
userArgMap.keySet().removeAll(currentUserArgs.getArgumentsAsMap().keySet());
+                    }
                 } catch (AbstractMethodError e) {
                     log.warn("BackendListenerClient doesn't implement "
                             + "getDefaultParameters.  Default parameters won't 
"

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1817575&r1=1817574&r2=1817575&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Dec  8 21:32:24 2017
@@ -157,7 +157,6 @@ Summary
 <h3>Report / Dashboard</h3>
 <ul>
     <li><bug>61871</bug>Reduce 
jmeter.reportgenerator.graph.responseTimeDistribution.property.set_granularity 
default value from 500ms to 100ms</li>
-    <li><bug>61872</bug>Better labels in dynamic HTML report</li> 
 </ul>
 
 <h3>General</h3>
@@ -233,6 +232,7 @@ Summary
 <h3>Listeners</h3>
 <ul>
     <li><bug>61742</bug>BackendListener: fix default value for 
<code>backend_graphite.send_interval</code></li>
+    <li><bug>61878</bug>BackendListener : NPE if 
BackendListenerClient#getDefaultParameters returns null</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>