Author: markt
Date: Fri Jul 7 08:43:14 2017
New Revision: 1801130
URL: http://svn.apache.org/viewvc?rev=1801130&view=rev
Log:
FindBugs: Fix possible NPE
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?rev=1801130&r1=1801129&r2=1801130&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Fri Jul 7 08:43:14 2017
@@ -42,7 +42,7 @@ import org.apache.catalina.LifecycleExce
*
* <p>The <code>*.jar</code> suffix can be used to include all JAR files in a
* certain directory. If a file or a directory does not exist, it will be
- * skipped.
+ * skipped.
* </p>
*
*
@@ -143,26 +143,28 @@ public class VirtualWebappLoader extends
directory.getAbsolutePath()));
}
String filenames[] = directory.list();
- Arrays.sort(filenames);
- for (int j = 0; j < filenames.length; j++) {
- String filename = filenames[j].toLowerCase(Locale.ENGLISH);
- if (!filename.endsWith(".jar"))
- continue;
- File file = new File(directory, filenames[j]);
- if (!file.isFile()) {
+ if (filenames != null) {
+ Arrays.sort(filenames);
+ for (int j = 0; j < filenames.length; j++) {
+ String filename =
filenames[j].toLowerCase(Locale.ENGLISH);
+ if (!filename.endsWith(".jar"))
+ continue;
+ File file = new File(directory, filenames[j]);
+ if (!file.isFile()) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString(
+ "virtualWebappLoader.token.notFile",
+ file.getAbsolutePath()));
+ }
+ continue;
+ }
if (log.isDebugEnabled()) {
log.debug(sm.getString(
- "virtualWebappLoader.token.notFile",
+ "virtualWebappLoader.token.file",
file.getAbsolutePath()));
}
- continue;
- }
- if (log.isDebugEnabled()) {
- log.debug(sm.getString(
- "virtualWebappLoader.token.file",
- file.getAbsolutePath()));
+ set.add(file.toURI().toString());
}
- set.add(file.toURI().toString());
}
} else {
// single file or directory
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
