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 2015/12/11 22:20:42 UTC
svn commit: r1719567 -
/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Author: pmouawad
Date: Fri Dec 11 21:20:42 2015
New Revision: 1719567
URL: http://svn.apache.org/viewvc?rev=1719567&view=rev
Log:
comment that file cannot be null
Modified:
jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=1719567&r1=1719566&r2=1719567&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java Fri Dec 11 21:20:42 2015
@@ -511,6 +511,7 @@ public class FileServer {
File src = new File(basedir);
if (src.isDirectory() && src.list() != null) {
File[] lfiles = src.listFiles(new JMeterFileFilter(extensions));
+ // lfiles cannot be null as it has been checked before
int count = lfiles.length;
input = lfiles[ThreadLocalRandom.current().nextInt(count)];
}
Re: svn commit: r1719567 - /jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
Posted by sebb <se...@gmail.com>.
On 11 December 2015 at 21:20, <pm...@apache.org> wrote:
> Author: pmouawad
> Date: Fri Dec 11 21:20:42 2015
> New Revision: 1719567
>
> URL: http://svn.apache.org/viewvc?rev=1719567&view=rev
> Log:
> comment that file cannot be null
>
> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=1719567&r1=1719566&r2=1719567&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java Fri Dec 11 21:20:42 2015
> @@ -511,6 +511,7 @@ public class FileServer {
> File src = new File(basedir);
> if (src.isDirectory() && src.list() != null) {
> File[] lfiles = src.listFiles(new JMeterFileFilter(extensions));
> + // lfiles cannot be null as it has been checked before
Not strictly true.
Although we know that the src File was a directory, the listFiles()
method can still return null if an IO error occurs.
Also in theory the directory can be deleted in the window between
checking it and listing it.
It would be safer to dispense with the pre-checks and check for a null response.
> int count = lfiles.length;
> input = lfiles[ThreadLocalRandom.current().nextInt(count)];
> }
>
>