glenn 01/06/22 13:20:54
Modified: catalina/src/share/org/apache/naming/resources
FileDirContext.java
Log:
Fix path for windows file separator
Revision Changes Path
1.4 +6 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java
Index: FileDirContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileDirContext.java 2001/03/31 03:00:41 1.3
+++ FileDirContext.java 2001/06/22 20:20:54 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.3 2001/03/31 03:00:41 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2001/03/31 03:00:41 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.4 2001/06/22 20:20:54 glenn Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/06/22 20:20:54 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* Filesystem Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.3 $ $Date: 2001/03/31 03:00:41 $
+ * @version $Revision: 1.4 $ $Date: 2001/06/22 20:20:54 $
*/
public class FileDirContext extends BaseDirContext {
@@ -218,7 +218,6 @@
*/
public Object lookup(String name)
throws NamingException {
-
Object result = null;
File file = file(name);
@@ -843,6 +842,8 @@
* @param name Normalized context-relative path (with leading '/')
*/
protected File file(String name) {
+ if( File.separatorChar == '\\' )
+ name = name.replace('/',File.separatorChar);
File file = new File(base, name);
if (file.exists() && file.canRead()) {
