Author: kkolinko
Date: Thu Aug 30 06:43:52 2012
New Revision: 1378818
URL: http://svn.apache.org/viewvc?rev=1378818&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53800
FileDirContext.list() did not provide correct paths for subdirectories.
Patch provided by Kevin Wooten.
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=1378818&r1=1378817&r2=1378818&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Thu Aug
30 06:43:52 2012
@@ -872,7 +872,7 @@ public class FileDirContext extends Base
Object object = null;
if (currentFile.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
- tempContext.setDocBase(file.getPath());
+ tempContext.setDocBase(currentFile.getPath());
tempContext.setAllowLinking(getAllowLinking());
object = tempContext;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
