You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/12/09 14:38:58 UTC
svn commit: r1549569 -
/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
Author: markt
Date: Mon Dec 9 13:38:58 2013
New Revision: 1549569
URL: http://svn.apache.org/r1549569
Log:
Fix Windows specific issue when converting a file system path to a web application path ('\' -> '/')
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1549569&r1=1549568&r2=1549569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Mon Dec 9 13:38:58 2013
@@ -326,8 +326,13 @@ public class TldScanner {
return FileVisitResult.CONTINUE;
}
- String resourcePath = webappPath + "/" +
- file.subpath(filePath.getNameCount(), file.getNameCount());
+ String subPath = file.subpath(
+ filePath.getNameCount(), file.getNameCount()).toString();
+ if ('/' != File.separatorChar) {
+ subPath = subPath.replace(File.separatorChar, '/');
+ }
+ String resourcePath = webappPath + "/" + subPath;
+
try {
URL url = file.toUri().toURL();
TldResourcePath path = new TldResourcePath(url, resourcePath);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org