remm 01/11/02 18:13:27
Modified: catalina/src/share/org/apache/naming/resources Tag:
tomcat_40_branch FileDirContext.java
Log:
- Port from HEAD:
- Fix security manager bug when using Windows. The base should be an
absolute path (instead of a relative path), otherwise a security exception would
be thrown by the case sensitivity checking code when trying to access the
user.dir system property.
Revision Changes Path
No revision
No revision
1.7.2.2 +10 -6
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.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- FileDirContext.java 2001/10/04 19:29:12 1.7.2.1
+++ FileDirContext.java 2001/11/03 02:13:27 1.7.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.7.2.1 2001/10/04 19:29:12 remm Exp $
- * $Revision: 1.7.2.1 $
- * $Date: 2001/10/04 19:29:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/resources/FileDirContext.java,v
1.7.2.2 2001/11/03 02:13:27 remm Exp $
+ * $Revision: 1.7.2.2 $
+ * $Date: 2001/11/03 02:13:27 $
*
* ====================================================================
*
@@ -99,7 +99,7 @@
* Filesystem Directory Context implementation helper class.
*
* @author Remy Maucherat
- * @version $Revision: 1.7.2.1 $ $Date: 2001/10/04 19:29:12 $
+ * @version $Revision: 1.7.2.2 $ $Date: 2001/11/03 02:13:27 $
*/
public class FileDirContext extends BaseDirContext {
@@ -175,13 +175,17 @@
(sm.getString("resources.null"));
// Calculate a File object referencing this document base directory
- File base = new File(docBase);
+ base = new File(docBase);
+ try {
+ base = base.getCanonicalFile();
+ } catch (IOException e) {
+ // Ignore
+ }
// Validate that the document base is an existing directory
if (!base.exists() || !base.isDirectory() || !base.canRead())
throw new IllegalArgumentException
(sm.getString("fileResources.base", docBase));
- this.base = base;
this.absoluteBase = normalize(base.getAbsolutePath());
super.setDocBase(docBase);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
