Revision: 968
http://stripes.svn.sourceforge.net/stripes/?rev=968&view=rev
Author: bengunter
Date: 2008-10-08 02:52:13 +0000 (Wed, 08 Oct 2008)
Log Message:
-----------
Revert revision 960 (STS-575) because it was poorly implemented and breaks
mapping to context root with a welcome file
Revision Links:
--------------
http://stripes.svn.sourceforge.net/stripes/?rev=960&view=rev
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2008-10-08 02:10:47 UTC (rev 967)
+++
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2008-10-08 02:52:13 UTC (rev 968)
@@ -289,16 +289,20 @@
* @return the servlet-context relative path that is being requested
*/
protected String getRequestedPath(HttpServletRequest request) {
+ String servletPath = null, pathInfo = null;
+
// Check to see if the request is processing an include, and pull the
path
// information from the appropriate source.
if (request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH) !=
null) {
- String servletPath = (String)
request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH);
- String pathInfo = (String)
request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH_INFO);
- return (servletPath == null ? "" : servletPath) + (pathInfo ==
null ? "" : pathInfo);
+ servletPath = (String)
request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH);
+ pathInfo = (String)
request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH_INFO);
}
else {
- return request.getRequestURI();
+ servletPath = request.getServletPath();
+ pathInfo = request.getPathInfo();
}
+
+ return (servletPath == null ? "" : servletPath) + (pathInfo == null ?
"" : pathInfo);
}
/**
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
