You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/01/22 16:16:25 UTC
[myfaces] branch 2.3.x updated: fixed exact mapping integration
tests
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch 2.3.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/2.3.x by this push:
new 555ee74 fixed exact mapping integration tests
555ee74 is described below
commit 555ee74ed9cb2097eded83d264c17969c846c83c
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Tue Jan 22 17:15:34 2019 +0100
fixed exact mapping integration tests
---
.../shared/application/DefaultViewHandlerSupport.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java b/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
index aba4cfa..dd683e6 100644
--- a/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
+++ b/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java
@@ -85,6 +85,14 @@ public class DefaultViewHandlerSupport implements ViewHandlerSupport
{
viewId = handleSuffixMapping(context, viewId);
}
+ else if (mapping.isExactMapping())
+ {
+ // if the current request is a exact mapping and the viewId equals the exact viewId
+ if (viewId.equals(mapping.getExact()))
+ {
+ viewId = handleSuffixMapping(context, viewId + ".jsf");
+ }
+ }
else if(mapping.isPrefixMapping())
{
viewId = handlePrefixMapping(viewId,mapping.getPrefix());
@@ -132,6 +140,14 @@ public class DefaultViewHandlerSupport implements ViewHandlerSupport
{
viewId = handleSuffixMapping(context, viewId);
}
+ else if (mapping.isExactMapping())
+ {
+ // if the current request is a exact mapping and the viewId equals the exact viewId
+ if (viewId.equals(mapping.getExact()))
+ {
+ viewId = handleSuffixMapping(context, viewId + ".jsf");
+ }
+ }
else if(mapping.isPrefixMapping())
{
viewId = handlePrefixMapping(viewId,mapping.getPrefix());