Author: markt
Date: Sat Aug 15 12:06:24 2009
New Revision: 804461
URL: http://svn.apache.org/viewvc?rev=804461&view=rev
Log:
Revert r701358 for https://issues.apache.org/bugzilla/show_bug.cgi?id=45403
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=804461&r1=804460&r2=804461&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Sat Aug
15 12:06:24 2009
@@ -773,15 +773,6 @@
protected File file(String name) {
File file = new File(base, name);
- return validate(file);
-
- }
-
-
- /*
- * Check that the file is valid for this context
- */
- private File validate(File file) {
if (file.exists() && file.canRead()) {
if (allowLinking)
@@ -854,9 +845,7 @@
for (int i = 0; i < names.length; i++) {
- File currentFile = validate(new File(file, names[i]));
- if (currentFile == null) continue;
-
+ File currentFile = new File(file, names[i]);
Object object = null;
if (currentFile.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
