myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: refactored
Date Mon, 14 Oct 2019 12:48:53 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new e1b87f0  refactored
e1b87f0 is described below

commit e1b87f0c228ea82661946a770120ab8246353a28
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Mon Oct 14 14:48:46 2019 +0200

    refactored
---
 api/src/main/java/javax/faces/application/_NavigationUtils.java | 7 +++++--
 impl/src/main/java/org/apache/myfaces/util/NavigationUtils.java | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/javax/faces/application/_NavigationUtils.java b/api/src/main/java/javax/faces/application/_NavigationUtils.java
index 73ae152..98689c0 100644
--- a/api/src/main/java/javax/faces/application/_NavigationUtils.java
+++ b/api/src/main/java/javax/faces/application/_NavigationUtils.java
@@ -88,8 +88,11 @@ class _NavigationUtils
         for (int i = 0; i < values.size(); i++)
         {
             String value = values.get(i);
-            // evaluate the ValueExpression
-            value = context.getApplication().evaluateExpressionGet(context, value, String.class);
+            if (_isExpression(value))
+            {
+                // evaluate the ValueExpression
+                value = context.getApplication().evaluateExpressionGet(context, value, String.class);
+            }
             target.add(value);
         }
         return target;
diff --git a/impl/src/main/java/org/apache/myfaces/util/NavigationUtils.java b/impl/src/main/java/org/apache/myfaces/util/NavigationUtils.java
index 75b7be1..6bc663a 100644
--- a/impl/src/main/java/org/apache/myfaces/util/NavigationUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/NavigationUtils.java
@@ -132,8 +132,11 @@ public final class NavigationUtils
         for (int i = 0; i < values.size(); i++)
         {
             String value = values.get(i);
-            // evaluate the ValueExpression
-            value = context.getApplication().evaluateExpressionGet(context, value, String.class);
+            if (_isExpression(value))
+            {
+                // evaluate the ValueExpression
+                value = context.getApplication().evaluateExpressionGet(context, value, String.class);
+            }
             target.add(value);
         }
         return target;


Mime
View raw message