Author: kkolinko
Date: Thu Aug 30 06:49:33 2012
New Revision: 1378819
URL: http://svn.apache.org/viewvc?rev=1378819&view=rev
Log:
Merged revision 1378818 from tomcat/trunk:
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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1378818
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1378819&r1=1378818&r2=1378819&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Thu Aug 30 06:49:33 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 {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1378819&r1=1378818&r2=1378819&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Aug 30 06:49:33 2012
@@ -185,6 +185,11 @@
<fix>
Remove unneeded handling of FORM authentication in RealmBase.
(kkolinko)
</fix>
+ <fix>
+ <bug>53800</bug>: <code>FileDirContext.list()</code> did not provide
+ correct paths for subdirectories. Patch provided by Kevin Wooten.
+ (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
