You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by or...@apache.org on 2005/09/10 02:07:54 UTC
svn commit: r279920 - in
/myfaces/impl/trunk/src/java/org/apache/myfaces/application:
NavigationHandlerImpl.java jsp/JspViewHandlerImpl.java
Author: oros
Date: Fri Sep 9 17:07:49 2005
New Revision: 279920
URL: http://svn.apache.org/viewcvs?rev=279920&view=rev
Log:
MYFACES-542
Modified:
myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=279920&r1=279919&r2=279920&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/application/NavigationHandlerImpl.java Fri Sep 9 17:07:49 2005
@@ -126,22 +126,6 @@
ExternalContext externalContext = facesContext.getExternalContext();
ViewHandler viewHandler = facesContext.getApplication().getViewHandler();
String redirectPath = viewHandler.getActionURL(facesContext, navigationCase.getToViewId());
- Object req = externalContext.getRequest();
- if (req instanceof HttpServletRequest)
- {
- String queryString = ((HttpServletRequest)req).getQueryString();
- if (queryString != null)
- {
- if (redirectPath.indexOf('?') == -1)
- {
- redirectPath = redirectPath + '?' + queryString;
- }
- else
- {
- redirectPath = redirectPath + '&' + queryString;
- }
- }
- }
try
{
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=279920&r1=279919&r2=279920&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Fri Sep 9 17:07:49 2005
@@ -346,32 +346,39 @@
WebXml webxml = WebXml.getWebXml(externalContext);
List mappings = webxml.getFacesServletMappings();
- boolean isExtensionMapping = (requestPathInfo == null);
- for (int i = 0, size = mappings.size(); i < size; i++)
+ if (requestPathInfo == null)
{
- ServletMapping servletMapping = (ServletMapping) mappings.get(i);
- if (servletMapping.isExtensionMapping() == isExtensionMapping)
+ // might be extension mapping
+ for (int i = 0, size = mappings.size(); i < size; i++)
{
+ ServletMapping servletMapping = (ServletMapping) mappings.get(i);
String urlpattern = servletMapping.getUrlPattern();
- if (isExtensionMapping)
+ String extension = urlpattern.substring(1, urlpattern.length());
+ if (servletPath.endsWith(extension))
{
- String extension = urlpattern.substring(1, urlpattern.length());
- if (servletPath.endsWith(extension))
- {
- return servletMapping;
- }
+ return servletMapping;
+ } else if (servletPath.equals(urlpattern)) {
+ // path mapping with no pathInfo for the current request
+ return servletMapping;
}
- else
+ }
+ }
+ else
+ {
+ // path mapping
+ for (int i = 0, size = mappings.size(); i < size; i++)
+ {
+
+ ServletMapping servletMapping = (ServletMapping) mappings.get(i);
+ String urlpattern = servletMapping.getUrlPattern();
+ urlpattern = urlpattern.substring(0, urlpattern.length() - 2);
+ // servletPath starts with "/" except in the case where the
+ // request is matched with the "/*" pattern, in which case
+ // it is the empty string (see Servlet Sepc 2.3 SRV4.4)
+ if (servletPath.equals(urlpattern))
{
- urlpattern = urlpattern.substring(0, urlpattern.length() - 2);
- // servletPath starts with "/" except in the case where the
- // request is matched with the "/*" pattern, in which case
- // it is the empty string (see Servlet Sepc 2.3 SRV4.4)
- if (servletPath.equals(urlpattern))
- {
- return servletMapping;
- }
+ return servletMapping;
}
}
}