remm 01/01/18 11:06:51
Modified: catalina/src/share/org/apache/catalina/resources
FileResources.java
Log:
- Now handles the case where File.list() returns null. This fixes some rare NPE
cases. That problem was already fixed in 4.1.
Revision Changes Path
1.8 +8 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/FileResources.java
Index: FileResources.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/FileResources.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FileResources.java 2000/12/02 20:24:37 1.7
+++ FileResources.java 2001/01/18 19:06:49 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/FileResources.java,v
1.7 2000/12/02 20:24:37 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2000/12/02 20:24:37 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/resources/FileResources.java,v
1.8 2001/01/18 19:06:49 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/01/18 19:06:49 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.7 $ $Date: 2000/12/02 20:24:37 $
+ * @version $Revision: 1.8 $ $Date: 2001/01/18 19:06:49 $
*/
public final class FileResources extends ResourcesBase {
@@ -571,8 +571,10 @@
File file = file(normalized);
if (file != null) {
String[] dirList = file.list();
- for (int i=0; i<dirList.length; i++) {
- dirList[i] = normalize(normalized + "/" + dirList[i]);
+ if (dirList != null) {
+ for (int i=0; i<dirList.length; i++) {
+ dirList[i] = normalize(normalized + "/" + dirList[i]);
+ }
}
return dirList;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
