Author: markt
Date: Thu Oct 2 04:47:46 2008
New Revision: 701091
URL: http://svn.apache.org/viewvc?rev=701091&view=rev
Log:
Revert this patch whilst I figure out why it breaks class loading.
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=701091&r1=701090&r2=701091&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Thu Oct
2 04:47:46 2008
@@ -896,9 +896,7 @@
for (int i = 0; i < names.length; i++) {
- File currentFile = file(file.getName() + "/" + 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
