Hi Rob, I don’t think those lines were doing what you thought.  Without
them, there is no support for inherited messages.


James Mitchell
Software Engineer/Struts Evangelist
http://www.open-tools.org




> -----Original Message-----
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Sent: Wednesday, October 16, 2002 10:57 PM
> To: [EMAIL PROTECTED]
> Subject: cvs commit: jakarta-struts/src/share/org/apache/struts/util
> PropertyMessageResources.java
>
>
> rleland     2002/10/16 19:56:58
>
>   Modified:    src/share/org/apache/struts/util
>                         PropertyMessageResources.java
>   Log:
>   Removed 2 if statements where condition was always true,
>   and cleanup JavaDoc
>
>   Revision  Changes    Path
>   1.6       +7 -8
> jakarta-struts/src/share/org/apache/struts/util/PropertyMessageRes
> ources.java
>
>   Index: PropertyMessageResources.java
>   ===================================================================
>   RCS file:
> /home/cvs/jakarta-struts/src/share/org/apache/struts/util/Property
> MessageResources.java,v
>   retrieving revision 1.5
>   retrieving revision 1.6
>   diff -u -r1.5 -r1.6
>   --- PropertyMessageResources.java   21 Jul 2002 01:00:40 -0000      1.5
>   +++ PropertyMessageResources.java   17 Oct 2002 02:56:58 -0000      1.6
>   @@ -169,6 +169,7 @@
>         * @param locale The requested message Locale, or <code>null</code>
>         *  for the system default Locale
>         * @param key The message key to look up
>   +     * @return text message for the specified key and locale
>         */
>        public String getMessage(Locale locale, String key) {
>
>   @@ -218,8 +219,7 @@
>                synchronized (messages) {
>                    message = (String) messages.get(messageKey);
>                    if (message != null) {
>   -                    if (addIt)
>   -                        messages.put(originalKey, message);
>   +                    messages.put(originalKey, message);
>                        return (message);
>                    }
>                }
>   @@ -232,8 +232,7 @@
>            synchronized (messages) {
>                message = (String) messages.get(messageKey);
>                if (message != null) {
>   -                if (addIt)
>   -                    messages.put(originalKey, message);
>   +                messages.put(originalKey, message);
>                    return (message);
>                }
>            }
>
>
>
>
> --
> To unsubscribe, e-mail:
> <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail:
> <mailto:[EMAIL PROTECTED]>
>
>


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to