Author: markt Date: Mon Mar 9 10:00:59 2015 New Revision: 1665169 URL: http://svn.apache.org/r1665169 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57643 Use new File(URI) to correctly convert between a file:// URL and an absolute path. Fixes JspC when getResource() returns an encoded URL.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1665169&r1=1665168&r2=1665169&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Mon Mar 9 10:00:59 2015 @@ -242,17 +242,16 @@ public class JspCServletContext implemen 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; } - } Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1665169&r1=1665168&r2=1665169&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Mar 9 10:00:59 2015 @@ -239,6 +239,11 @@ <bug>57662</bug>: Update all references to the ECJ compiler to version 4.4.2. (violetagg) </update> + <fix> + <bug>57643</bug>: Fix JspC when the path to the web application to + compile contains a character that must be encoded when used in a URL + such as space. (mark) + </fix> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org