remm 01/01/12 21:15:56 Modified: catalina/src/share/org/apache/naming/resources FileDirContext.java Log: - Fix minor path related problems. - Still three unimplemented functions. - Apparently, there are problems with encoding/decoding (so accessing files containing spaces fail. This is probably a problem with the FileDirContext implementation. Revision Changes Path 1.3 +8 -4 jakarta-tomcat-4.1/catalina/src/share/org/apache/naming/resources/FileDirContext.java Index: FileDirContext.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FileDirContext.java 2001/01/12 06:59:08 1.2 +++ FileDirContext.java 2001/01/13 05:15:55 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v 1.2 2001/01/12 06:59:08 remm Exp $ - * $Revision: 1.2 $ - * $Date: 2001/01/12 06:59:08 $ + * $Header: /home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v 1.3 2001/01/13 05:15:55 remm Exp $ + * $Revision: 1.3 $ + * $Date: 2001/01/13 05:15:55 $ * * ==================================================================== * @@ -97,7 +97,7 @@ * Filesystem Directory Context implementation helper class. * * @author Remy Maucherat - * @version $Revision: 1.2 $ $Date: 2001/01/12 06:59:08 $ + * @version $Revision: 1.3 $ $Date: 2001/01/13 05:15:55 $ */ public class FileDirContext extends BaseDirContext { @@ -796,7 +796,11 @@ } catch (IOException e) { } absPath = absPath.substring(absoluteBase.length()); + if (absPath.equals("")) + absPath = "/"; canPath = canPath.substring(absoluteBase.length()); + if (canPath.equals("")) + canPath = "/"; if ((canPath == null) || (absPath == null) || (!canPath.equals(absPath))) return null; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]