Author: markt
Date: Mon Mar 9 10:05:10 2015
New Revision: 1665172
URL: http://svn.apache.org/r1665172
Log:
Use new File(URI) to correctly convert between a file:// URL and an absolute
path.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1665172&r1=1665171&r2=1665172&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Mon Mar 9 10:05:10 2015
@@ -301,19 +301,17 @@ public class JspCServletContext implemen
*/
@Override
public String getRealPath(String path) {
-
if (!myResourceBaseURL.getProtocol().equals("file"))
- return (null);
+ return null;
if (!path.startsWith("/"))
- return (null);
+ return null;
try {
- return
- (getResource(path).getFile().replace('/', File.separatorChar));
+ File f = new File(getResource(path).toURI());
+ return f.getAbsolutePath();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- return (null);
+ return null;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
