Author: simoneg
Date: Wed Nov 25 17:28:26 2009
New Revision: 884207

URL: http://svn.apache.org/viewvc?rev=884207&view=rev
Log:
Prevent useless i18n NPE

Modified:
    
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java

Modified: 
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java?rev=884207&r1=884206&r2=884207&view=diff
==============================================================================
--- 
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
 (original)
+++ 
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
 Wed Nov 25 17:28:26 2009
@@ -117,6 +117,8 @@
         * @return The translation or the original string if no translation 
found.
         */
        public String getMessage(Stack<ContextElement> ct, String original) {
+               // Avoid NPEs, a null is an empty string when it is 
"internazionalized".
+               if (original == null) return "";
                String deh = normalize(original);
                String ret = messages.get(ct, deh);
                if (ret == null) return original;



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to