Author: markt
Date: Thu Oct 4 16:35:45 2012
New Revision: 1394146
URL: http://svn.apache.org/viewvc?rev=1394146&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/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1394146&r1=1394145&r2=1394146&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 4 16:35:45 2012
@@ -89,13 +89,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: schultz, kkolinko, jfclere
-1:
-* 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.
- http://svn.apache.org/viewvc?view=revision&revision=1378819
- +1: kkolinko, kfujino, schultz, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53830
Better handling of Manager.randomFile default value on Windows
https://issues.apache.org/bugzilla/attachment.cgi?id=29330
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1394146&r1=1394145&r2=1394146&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Thu Oct 4 16:35:45 2012
@@ -863,7 +863,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());
tempContext.setCaseSensitive(isCaseSensitive());
object = tempContext;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1394146&r1=1394145&r2=1394146&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 4 16:35:45 2012
@@ -205,6 +205,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
