Attachment 11729 Details for Bug 18521 – MessageTag patch

[patch] MessageTag patch

MessageTag.18521.patch (text/plain), 1.44 KB, created by Patrick Samson on 2004-06-02 15:02:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Samson

Created: 2004-06-02 15:02:01 UTC

Size: 1.44 KB

patch

obsolete

>Index: MessageTag.java
>===================================================================
>RCS file: /home/cvspublic/jakarta-taglibs/i18n/src/org/apache/taglibs/i18n/MessageTag.java,v
>retrieving revision 1.7
>diff -u -r1.7 MessageTag.java
>--- MessageTag.java	29 Feb 2004 06:58:47 -0000	1.7
>+++ MessageTag.java	2 Jun 2004 14:59:55 -0000
>@@ -204,6 +204,20 @@
>     }
> 
>     /**
>+     *  If key is not found, use the body content as a default value.
>+     */
>+    public int doAfterBody() throws JspException
>+    {
>+        // if the value is null, use the body content
>+        if ( _value == null ) {
>+          _value = bodyContent.getString();
>+        }
>+        // cleanup
>+        bodyContent.clearBody();
>+    	return SKIP_BODY;
>+    }
>+
>+    /**
>      *  Performs the proper runtime substitution. If an id attribute was
>      *  specified, then it is assumed that this tag is merely defining a
>      *  string variable; otherwise output is provided.
>@@ -211,12 +225,6 @@
>     public final int doEndTag() throws JspException
>     {
>         try {
>-            // if the value is null, use the body content
>-            if ( _value == null ) {
>-                _value = bodyContent.getString();
>-                bodyContent.clear();
>-            }
>-
>             // perform parameter substitutions
>             if ( _value != null && _arguments != null && _arguments.size() > 0) {
>                 // reformat the value as specified

Actions: View | Diff

Attachments on bug 18521: 11729