billbarker 2003/09/14 14:28:32
Modified: src/share/org/apache/tomcat/util/io FileUtil.java
Log:
Restore the test that I mistakenly removed on the last commit.
Revision Changes Path
1.11 +8 -5 jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java
Index: FileUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FileUtil.java 14 Sep 2003 04:17:47 -0000 1.10
+++ FileUtil.java 14 Sep 2003 21:28:32 -0000 1.11
@@ -210,8 +210,11 @@
if (File.separatorChar == '\\') {
// On Windows check ignore case....
if (!realPath.equals(canPath)){
- if(caseSf || !realPath.equalsIgnoreCase(canPath))
- return null;
+ int ls = realPath.lastIndexOf('\\');
+ if(ls > 0 && !realPath.substring(0,ls).equals(canPath)) {
+ if(caseSf || !realPath.equalsIgnoreCase(canPath))
+ return null;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
