Author: markt
Date: Thu Sep 28 18:40:58 2017
New Revision: 1810026
URL: http://svn.apache.org/viewvc?rev=1810026&view=rev
Log:
Further alignment with 8.0.x and later. Fixes Linux test failures.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
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=1810026&r1=1810025&r2=1810026&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 Sep 28 18:40:58 2017
@@ -804,6 +804,10 @@ public class FileDirContext extends Base
* @param mustExist Must the specified resource exist?
*/
protected File file(String name, boolean mustExist) {
+ if (name.equals("/")) {
+ name = "";
+ }
+
File file = new File(base, name);
return validate(file, name, mustExist, absoluteBase, canonicalBase);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
