You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ma...@apache.org on 2003/11/28 02:55:40 UTC

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/logic MessagesPresentTag.java

martinc     2003/11/27 17:55:40

  Modified:    src/share/org/apache/struts/taglib/logic
                        MessagesPresentTag.java
  Log:
  Use a local variable for the messages key name, instead of stomping on the
  tag attribute value, so that the tag is happy in a reuse scenario.
  
  PR: 23523
  Submitted by: Klaus Bucka-Lassen & Jan Sorensen
  
  Revision  Changes    Path
  1.11      +4 -3      jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java
  
  Index: MessagesPresentTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/logic/MessagesPresentTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MessagesPresentTag.java	23 Aug 2003 00:22:12 -0000	1.10
  +++ MessagesPresentTag.java	28 Nov 2003 01:55:40 -0000	1.11
  @@ -122,12 +122,13 @@
       protected boolean condition(boolean desired) throws JspException {
           ActionMessages am = null;
   
  +        String key = name;
           if (message != null && "true".equalsIgnoreCase(message)){
  -           name = Globals.MESSAGE_KEY;
  +           key = Globals.MESSAGE_KEY;
           }
   
           try {
  -            am = TagUtils.getInstance().getActionMessages(pageContext, name);
  +            am = TagUtils.getInstance().getActionMessages(pageContext, key);
               
           } catch (JspException e) {
               TagUtils.getInstance().saveException(pageContext, e);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org