You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2007/09/25 23:02:35 UTC

svn commit: r579380 - /myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java

Author: jwaldman
Date: Tue Sep 25 14:02:34 2007
New Revision: 579380

URL: http://svn.apache.org/viewvc?rev=579380&view=rev
Log:
TRINIDAD-734
https://issues.apache.org/jira/browse/TRINIDAD-734
EL expression used for node labels gets evaluated only once
Checked in for Gary Kind to 1.2.2-branch.

Modified:
    myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java

Modified: myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java?rev=579380&r1=579379&r2=579380&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java (original)
+++ myfaces/trinidad/branches/1.2.2-branch/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuNode.java Tue Sep 25 14:02:34 2007
@@ -78,7 +78,9 @@
         && UIComponentTag.isValueReference(_label)
        )
     {
-      _label = _evalElStr(_label);
+      // do not set _label to the evaluated EL.
+      // It may change at times in the EL.     
+      return _evalElStr(_label);               
     }
     return _label;
   }