jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1698295 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/util/FilePanelEntry.java xdocs/changes.xml
Date Fri, 28 Aug 2015 10:31:36 GMT
Author: sebb
Date: Fri Aug 28 10:31:36 2015
New Revision: 1698295

URL: http://svn.apache.org/r1698295
Log:
SOAP/XML-RPC Sampler file browser generates NullPointerException
Bugzilla Id: 58293

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java?rev=1698295&r1=1698294&r2=1698295&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java Fri Aug 28 10:31:36
2015
@@ -68,7 +68,9 @@ public class FilePanelEntry extends Hori
         if (listener != null) {
             listeners.add(listener);
         }
-        if (exts != null) {
+        if (exts != null && 
+          !(exts.length == 1 && exts[0] == null) // String null is converted to String[]{null}
+            ) {
             this.filetypes = new String[exts.length];
             System.arraycopy(exts, 0, this.filetypes, 0, exts.length);
         } else {

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1698295&r1=1698294&r2=1698295&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Aug 28 10:31:36 2015
@@ -184,6 +184,7 @@ Summary
     <li><bug>57821</bug>Command-line option "-X --remoteexit" doesn't work
since 2.13 (regression related to <bugzilla>57500</bugzilla>)</li>
     <li><bug>57731</bug>TESTSTART.MS has always the value of the first
Test started in Server mode in NON GUI Distributed testing</li>
     <li><bug>58016</bug> Error type casting using external SSL Provider.
Contributed by Kirill Yankov (myworkpostbox at gmail.com)</li>
+    <li><bug>58293</bug>SOAP/XML-RPC Sampler file browser generates NullPointerException</li>
 </ul>
 
  <!--  =================== Thanks =================== -->



Mime
View raw message