Author: nbubna
Date: Wed Feb 16 17:49:25 2005
New Revision: 154109
URL: http://svn.apache.org/viewcvs?view=rev&rev=154109
Log:
fix for bug #29837 - take path info into account when retrieving templates
Modified:
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Modified:
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?view=diff&r1=154108&r2=154109
==============================================================================
---
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
(original)
+++
jakarta/velocity-tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Wed Feb 16 17:49:25 2005
@@ -99,7 +99,7 @@
* @author <a href="mailto:[email protected]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nathan Bubna</a>
*
- * @version $Id: VelocityViewServlet.java,v 1.24 2004/11/11 07:02:24 nbubna
Exp $
+ * @version $Id$
*/
public class VelocityViewServlet extends HttpServlet
@@ -508,9 +508,16 @@
// attribute holds the correct path. See section 8.3 of the Servlet
// 2.3 specification.
String path =
(String)request.getAttribute("javax.servlet.include.servlet_path");
+ // also take into account the PathInfo stated on SRV.4.4 Request Path
Elements
+ String info =
(String)request.getAttribute("javax.servlet.include.path_info");
if (path == null)
{
path = request.getServletPath();
+ info = request.getPathInfo();
+ }
+ if (info != null)
+ {
+ path += info;
}
return getTemplate(path);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
