Author: craigmcc
Date: Sat Feb  4 19:23:48 2006
New Revision: 374968

URL: http://svn.apache.org/viewcvs?rev=374968&view=rev
Log:
Add a warning if a specified resource bundle cannot be found as well.

PR:  Bugzilla #38494
Submitted by:  Hermod Opstvedt <hermod.opstvedt AT dnb.no>

Modified:
    struts/shale/trunk/core-library/src/java/org/apache/shale/util/Messages.java

Modified: 
struts/shale/trunk/core-library/src/java/org/apache/shale/util/Messages.java
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/util/Messages.java?rev=374968&r1=374967&r2=374968&view=diff
==============================================================================
--- 
struts/shale/trunk/core-library/src/java/org/apache/shale/util/Messages.java 
(original)
+++ 
struts/shale/trunk/core-library/src/java/org/apache/shale/util/Messages.java 
Sat Feb  4 19:23:48 2006
@@ -294,7 +294,14 @@
                 } catch (MissingResourceException e) {
                     rb = ResourceBundle.getBundle(name, defaultLocale, cl);
                 }
-                bundles.put(locale, rb);
+                if (rb == null) {
+                    if (log().isWarnEnabled()) {
+                        log().warn("Resource bundle '" + getName() +
+                                   "' was not found for locale '" + locale + 
"'");
+                    }
+                } else {
+                    bundles.put(locale, rb);
+                }
             }
             return rb;
         }



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

Reply via email to