Author: timw
Date: Wed Oct 6 07:22:46 2010
New Revision: 1004912
URL: http://svn.apache.org/viewvc?rev=1004912&view=rev
Log:
More fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
Calculating complete resource path when accessed via RequestDispatcher.include()
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1004912&r1=1004911&r2=1004912&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Wed Oct
6 07:22:46 2010
@@ -348,21 +348,24 @@ public class DefaultServlet
if (request.getAttribute(Globals.INCLUDE_REQUEST_URI_ATTR) != null) {
String result = (String) request.getAttribute(
Globals.INCLUDE_PATH_INFO_ATTR);
- if (result == null)
+ if (result == null) {
result = (String) request.getAttribute(
Globals.INCLUDE_SERVLET_PATH_ATTR);
- if ((result == null) || (result.equals("")))
+ } else {
+ result = (String) request.getAttribute(
+ Globals.INCLUDE_SERVLET_PATH_ATTR) + result;
+ }
+ if ((result == null) || (result.equals(""))) {
result = "/";
+ }
return (result);
}
// No, extract the desired path directly from the request
String result = request.getPathInfo();
if (result == null) {
- // Mapped to '/'
result = request.getServletPath();
} else {
- // Mapped to '/path/*' so get entire path under context
result = request.getServletPath() + result;
}
if ((result == null) || (result.equals(""))) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
