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 2016/08/02 19:50:40 UTC
svn commit: r1755001 - in /jmeter/trunk/src/jorphan/org/apache/jorphan:
reflect/ClassFinder.java util/JOrphanUtils.java
Author: pmouawad
Date: Tue Aug 2 19:50:40 2016
New Revision: 1755001
URL: http://svn.apache.org/viewvc?rev=1755001&view=rev
Log:
Fix NPE warnings reported by Findbugs
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1755001&r1=1755000&r2=1755001&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Tue Aug 2 19:50:40 2016
@@ -154,8 +154,9 @@ public final class ClassFinder {
return name.endsWith(DOT_JAR);
}
});
- // jars cannot be null
- Collections.addAll(fullList, jars);
+ if(jars != null) {
+ Collections.addAll(fullList, jars);
+ }
}
}
}
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1755001&r1=1755000&r2=1755001&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Tue Aug 2 19:50:40 2016
@@ -603,7 +603,8 @@ public final class JOrphanUtils {
throw new IllegalArgumentException("Cannot write to '"
+folder.getAbsolutePath()+"' as it is an existing file");
} else {
- if(folder.listFiles().length > 0) {
+ File[] listedFiles = folder.listFiles();
+ if(listedFiles != null && listedFiles.length > 0) {
throw new IllegalArgumentException("Cannot write to '"
+folder.getAbsolutePath()+"' as folder is not empty");
}