rana_b 02/04/01 09:21:04
Modified: ftpserver/src/java/org/apache/avalon/ftpserver/util
VirtualDirectory.java
Log:
filelist null bug fixed
Revision Changes Path
1.4 +15 -12
jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/util/VirtualDirectory.java
Index: VirtualDirectory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/util/VirtualDirectory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualDirectory.java 6 Mar 2002 13:42:57 -0000 1.3
+++ VirtualDirectory.java 1 Apr 2002 17:21:04 -0000 1.4
@@ -6,7 +6,6 @@
* the LICENSE file.
*/
-
package org.apache.avalon.ftpserver.util;
import java.io.File;
@@ -357,7 +356,7 @@
return false;
}
- // now print
+ // get file list
File flLst[];
if ( (pattern == null) || pattern.equals("*") || pattern.equals("")
) {
flLst = lstDirObj.listFiles();
@@ -365,17 +364,21 @@
else {
flLst = lstDirObj.listFiles(new FileRegularFilter(pattern));
}
- for(int i=0; i<flLst.length; i++) {
- if ( (!bAll) && flLst[i].isHidden() ) {
- continue;
- }
- if(bDetail) {
- printLine(flLst[i], out);
- }
- else {
- out.write(getName(flLst[i]));
+
+ // print file list
+ if (flLst != null) {
+ for(int i=0; i<flLst.length; i++) {
+ if ( (!bAll) && flLst[i].isHidden() ) {
+ continue;
+ }
+ if(bDetail) {
+ printLine(flLst[i], out);
+ }
+ else {
+ out.write(getName(flLst[i]));
+ }
+ out.write(NEWLINE);
}
- out.write(NEWLINE);
}
return true;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
